ljacqu 7b26dd25a0 Merge master into 477-lastlogin-timestamp ...

Conflicts:
    - Settings.java

2016-02-13 20:03:22 +01:00

..

java/fr/xephi/authme

Merge master into 477-lastlogin-timestamp

2016-02-13 20:03:22 +01:00

resources

#482 Remove English messages in translation files

2016-02-11 22:48:34 +01:00