0xboobface 16fdee2a2c Merge branch 'dev' into fc2 ... # Conflicts: # client/src/main/java/ctbrec/ui/ExternalBrowser.java		2019-01-23 17:56:20 +01:00
..
main/java	Merge branch 'dev' into fc2	2019-01-23 17:56:20 +01:00
test/java/ctbrec	Change folder structure to maven conventions	2018-11-18 22:49:05 +01:00