0xb00bface cdf582ad8f Merge branch 'dev' into v4 ... # Conflicts: # client/src/main/java/ctbrec/ui/action/CheckModelAccountAction.java # client/src/main/java/ctbrec/ui/controls/SearchPopoverTreeList.java # client/src/main/java/ctbrec/ui/sites/camsoda/CamsodaShowsTab.java # client/src/main/resources/logback.xml # common/src/main/java/ctbrec/recorder/NextGenLocalRecorder.java # server/src/main/resources/logback.xml		2021-01-09 15:59:31 +01:00
..
.settings	Change context menu behavior to make sense with bookmarked models	2021-01-09 12:45:38 +01:00
src	Merge branch 'dev' into v4	2021-01-09 15:59:31 +01: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.0.0-SNAPSHOT	2020-12-29 14:44:11 +01:00