0xboobface a0a083aaf6 Merge branch 'dev' into fc2 ... # Conflicts: # common/src/main/java/ctbrec/io/HttpClient.java		2018-12-17 13:05:11 +01:00
..
main/java	Merge branch 'dev' into fc2	2018-12-17 13:05:11 +01:00
test/java/ctbrec	Change folder structure to maven conventions	2018-11-18 22:49:05 +01:00