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
..
main/java	Merge branch 'dev' into fc2	2019-01-20 13:51:04 +01:00
test/java/ctbrec	Change folder structure to maven conventions	2018-11-18 22:49:05 +01:00