Merge remote-tracking branch 'aetherseed/AetherSeed-patch-2' into master

Browse Source

Conflicts:
	lang/eo/strings.po

...

This commit is contained in:

Dušan Juretić

2017-07-11 21:47:57 -04:00

parent 127c378168 35d3776d80

commit abf1ecf749

1 changed files with 221 additions and 216 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

lang/eo/strings.po

+221 -216

File diff suppressed because it is too large Load Diff