0xb00bface 5f4e17c2d2 Merge branch 'dev' into showup ... # Conflicts: # common/src/main/java/ctbrec/sites/showup/ShowupHttpClient.java		2020-12-20 12:23:08 +01:00
..
.settings	Set versions in maven POMs	2019-11-23 17:14:44 +01:00
src	Merge branch 'dev' into showup	2020-12-20 12:23:08 +01:00
.classpath	Change folder structure to maven conventions	2018-11-18 22:49:05 +01:00
.gitignore	Add idea project files to .gitignore	2020-11-21 19:20:01 +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.10.10	2020-12-19 17:46:15 +01:00