0xboobface 55fc6729f8 Merge branch 'dev' into fc2 ... # Conflicts: # client/src/main/java/ctbrec/ui/CamrecApplication.java # client/src/main/java/ctbrec/ui/SiteUiFactory.java		2019-01-20 13:51:04 +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-20 13:51:04 +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	Increase version to 1.17.0	2019-01-19 16:06:50 +01:00