DNx5 a14e3260dc Merge branch 'db-improve' ... Conflicts: src/main/java/fr/xephi/authme/settings/Settings.java		2015-12-11 21:47:19 +07:00
..
main	Merge branch 'db-improve'	2015-12-11 21:47:19 +07:00
test	cleanup and update deps	2015-12-08 20:07:10 +01:00
tools	Tools: Remove I/O without user confirmation, minor refactoring	2015-12-10 20:24:20 +01:00