0xboobface 16fdee2a2c Merge branch 'dev' into fc2 ... # Conflicts: # client/src/main/java/ctbrec/ui/ExternalBrowser.java		2019-01-23 17:56:20 +01:00
..
CamsodaConfigUI.java	Logout and delete cookies when credentials are changed	2018-12-10 18:37:04 +01:00
CamsodaFollowedTab.java	Split up project into client, server, common and master	2018-11-18 22:42:13 +01:00
CamsodaFollowedUpdateService.java	Add Event and EventReaction classes	2018-12-06 17:39:33 +01:00
CamsodaShowsTab.java	Split up project into client, server, common and master	2018-11-18 22:42:13 +01:00
CamsodaSiteUi.java	Let SiteUi launch the player for a model stream	2019-01-21 15:31:13 +01:00
CamsodaTabProvider.java	Split up project into client, server, common and master	2018-11-18 22:42:13 +01:00
CamsodaUpdateService.java	Adjust CamsodaUpdateService to new JSON structure	2019-01-23 17:40:20 +01:00