Gabriele C. c880298e5d Merge branch 'master' into pre-release-cleanup ...

# Conflicts:
#	pom.xml
#	src/test/java/fr/xephi/authme/service/GeoIpServiceTest.java
#	src/test/java/fr/xephi/authme/service/ValidationServiceTest.java

2024-04-26 02:58:08 +02:00

..

authme

Merge branch 'master' into pre-release-cleanup

2024-04-26 02:58:08 +02:00