0xboobface a0a083aaf6 Merge branch 'dev' into fc2 ... # Conflicts: # common/src/main/java/ctbrec/io/HttpClient.java		2018-12-17 13:05:11 +01:00
..
.settings	Change folder structure to maven conventions	2018-11-18 22:49:05 +01:00
src	Merge branch 'dev' into fc2	2018-12-17 13:05:11 +01:00
.classpath	Change folder structure to maven conventions	2018-11-18 22:49:05 +01:00
.gitignore	Split up project into client, server, common and master	2018-11-18 22:42:13 +01:00
.project	Split up project into client, server, common and master	2018-11-18 22:42:13 +01:00
pom.xml	Bump version to 1.15.0	2018-12-13 16:24:45 +01:00