mirror of
https://git.krews.org/morningstar/Arcturus-Community.git
synced 2024-09-28 09:54:18 +02:00
Merge branch 'master' into 'dev'
# Conflicts: # README.md # pom.xml # src/main/java/com/eu/habbo/Emulator.java # src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogBuyItemEvent.java # src/main/java/com/eu/habbo/messages/incoming/catalog/CheckPetNameEvent.java # src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumPostThreadEvent.java
This commit is contained in:
commit
e70bffccf3