##// END OF EJS Templates
Merging upstream changes from trunk (after fixing small conflicts).
Merging upstream changes from trunk (after fixing small conflicts).

File last commit:

r1263:67f5e0c2
r1872:d21e2734 merge
Show More
InfoPlist.strings
0 lines | 188 B | application/octet-stream | TextLexer
Binary file (application/octet-stream)