Fixing new merge conflicts.

Browse Source

...

This commit is contained in:

Glitchfinder

2013-01-08 17:45:53 -08:00

parent 46bf22e36b fbe3c70b85

commit 3c919c3af7

19 changed files with 1781 additions and 2229 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

167

src/main/resources/locale/locale_ru.properties

File diff suppressed because one or more lines are too long