0xboobface 16752b892c Merge branch 'dev' into fc2 ... # Conflicts: # common/src/main/java/ctbrec/sites/jasmin/LiveJasminHttpClient.java		2019-01-24 19:16:52 +01:00
..
.settings	Change folder structure to maven conventions	2018-11-18 22:49:05 +01:00
src	Merge branch 'dev' into fc2	2019-01-24 19:16:52 +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	Set version to 1.17.1	2019-01-23 17:41:03 +01:00