Merge branch 'master' into dev

# Conflicts:
#	pom.xml
This commit is contained in:
GeorgH93 2020-08-08 01:37:36 +02:00
commit 7c8e50d12f
No known key found for this signature in database
GPG Key ID: D1630D37F9E4B3C8

View File

@ -44,7 +44,7 @@
<dependency>
<groupId>at.pcgamingfreaks</groupId>
<artifactId>BadRabbit-Bukkit</artifactId>
<version>1.8</version>
<version>1.9</version>
</dependency>
<!-- Tests -->
<dependency>