Harmonic 934741ea16 Merge branch 'dev' into 'wired-to-json' ... # Conflicts: # sqlupdates/2_4_0 to 3_0_BETA_1.sql		2021-01-10 18:06:29 -05:00
..
java/com/eu/habbo	Merge branch 'dev' into 'wired-to-json'	2021-01-10 18:06:29 -05:00
resources	Try to improve build size by reducing dependencies used for logging.	2020-05-05 02:24:33 +02:00