0xboobface 55fc6729f8 Merge branch 'dev' into fc2 ... # Conflicts: # client/src/main/java/ctbrec/ui/CamrecApplication.java # client/src/main/java/ctbrec/ui/SiteUiFactory.java		2019-01-20 13:51:04 +01:00
..
assembly	Introduce external browser for logins	2019-01-08 14:26:22 +01:00
main	Merge branch 'dev' into fc2	2019-01-20 13:51:04 +01:00
test/resources	Remove HLS player stuff	2018-11-29 13:36:23 +01:00