Merge branch 'release/alpha12'

Browse Source

...

This commit is contained in:

Dylan K. Taylor

2018-05-09 16:53:41 +01:00

parent 2a0a2134d1 5b6762d0d5

commit 78f8d54f89

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

2

src/pocketmine/lang/locale

Submodule src/pocketmine/lang/locale updated: 0770ef2ecf...22697bf0bc