Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into 347-config-rewrite

Browse Source

# Conflicts:
#	src/main/java/fr/xephi/authme/AuthMe.java

...

This commit is contained in:

ljacqu

2016-01-17 12:35:03 +01:00

parent e18be3024a 391e1b04a2

commit 4a85eedd2c

5 changed files with 29 additions and 14 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

src/main/resources/messages/messages_zhcn.yml

BIN

Binary file not shown.