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
..
assembly	Set system property file.encoding to utf-8 in all start scripts	2021-01-07 20:59:23 +01:00
main	Merge branch 'dev' into v4	2021-01-09 15:59:31 +01:00
test/resources	Remove HLS player stuff	2018-11-29 13:36:23 +01:00