0xb00bface 1f9dcf1ca4 Merge branch 'amatv' into dev ... # Conflicts: # client/src/main/java/ctbrec/ui/SiteUiFactory.java		2021-05-24 16:22:08 +02:00
..
.settings	Change context menu behavior to make sense with bookmarked models	2021-01-09 12:45:38 +01:00
src	Merge branch 'amatv' into dev	2021-05-24 16:22:08 +02:00
.classpath	Change context menu behavior to make sense with bookmarked models	2021-01-09 12:45:38 +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 4.3.1	2021-05-16 11:40:09 +02:00