0xboobface a0a083aaf6 Merge branch 'dev' into fc2 ... # Conflicts: # common/src/main/java/ctbrec/io/HttpClient.java		2018-12-17 13:05:11 +01:00
..
java/ctbrec/ui	Merge branch 'dev' into fc2	2018-12-17 13:05:11 +01:00
resources	Switch to much simpler JSON api	2018-12-14 14:58:12 +01:00