brenoepics 77ea291bb4 Merge branch 'dev' into 'calendar-fix' ... # Conflicts: # sqlupdates/3_0_0 to 3_0_1.sql # src/main/java/com/eu/habbo/habbohotel/campaign/calendar/CalendarCampaign.java # src/main/java/com/eu/habbo/habbohotel/campaign/calendar/CalendarManager.java # src/main/java/com/eu/habbo/habbohotel/commands/CalendarCommand.java # src/main/java/com/eu/habbo/messages/incoming/handshake/UsernameEvent.java		2022-03-21 22:22:49 +00:00
..
java/com/eu/habbo	Merge branch 'dev' into 'calendar-fix'	2022-03-21 22:22:49 +00:00
resources	Try to improve build size by reducing dependencies used for logging.	2020-05-05 02:24:33 +02:00