0xb00bface 500be5eee4 Merge branch 'dev' into v4 ... # Conflicts: # common/src/main/java/ctbrec/recorder/FFmpeg.java		2021-02-13 21:37:39 +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-02-13 21:37:39 +01:00
test/resources	Remove HLS player stuff	2018-11-29 13:36:23 +01:00