ljacqu bba35944b9 Merge branch '5.3-DEV' of https://github.com/AuthMe-Team/AuthMeReloaded ...

Conflicts:
	pom.xml

2017-01-29 14:45:42 +01:00

..

java/fr/xephi/authme

Merge branch '5.3-DEV' of https://github.com/AuthMe-Team/AuthMeReloaded

2017-01-29 14:45:42 +01:00

resources

Be consistent in Dutch language usage

2017-01-21 15:30:48 +01:00