0xb00bface db186e65f4 Merge branch 'dev' into manyvids ... # Conflicts: # common/src/main/java/ctbrec/io/HttpClient.java		2020-08-16 17:00:43 +02:00
..
.settings	Set versions in maven POMs	2019-11-23 17:14:44 +01:00
src	Merge branch 'dev' into manyvids	2020-08-16 17:00:43 +02: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	Set version to 3.8.6	2020-08-16 14:16:38 +02:00