AuthMeReloaded/src/main
Gabriele C e60a5190f9 Fix conflict
Conflicts:
	src/main/java/fr/xephi/authme/AuthMe.java
2015-11-01 23:37:12 +01:00
..
java/fr/xephi/authme Fix conflict 2015-11-01 23:37:12 +01:00
resources Improved Dutch language pack 2015-11-01 20:35:41 +01:00