ljacqu 42f46b51d3 Merge branch 'master' of https://github.com/AuthMe/AuthMeReloaded into limbo ... # Conflicts: # src/main/java/fr/xephi/authme/process/join/AsynchronousJoin.java # src/test/java/fr/xephi/authme/settings/SettingsConsistencyTest.java		2017-03-15 08:28:15 +01:00
..
commands.md	#989 Create configuration docs page	2016-10-23 18:29:42 +02:00
config.md	#1036 Add restoration options for Limbo allowFlight / fly speed / walk speed	2017-03-12 13:51:03 +01:00
hash_algorithms.md	#685 Fix PBKDF2 implementation	2016-11-25 15:51:15 +01:00
permission_nodes.md	#916 Fix authme.vip node description	2016-10-23 15:39:53 +02:00
translations.md	Fix inverse tags in messages_pt; update translations doc page	2017-03-13 20:34:55 +01:00