0xboobface b476c452ad Merge branch 'dev' into camsoda ... Conflicts: src/main/java/ctbrec/Settings.java src/main/java/ctbrec/recorder/server/HttpServer.java src/main/java/ctbrec/ui/CamrecApplication.java src/main/java/ctbrec/ui/ThumbCell.java		2018-10-30 19:06:20 +01:00
..
cam4	Fix JSON parse exception	2018-10-30 15:57:44 +01:00
camsoda	Only do initial login if credentials are available	2018-10-30 18:24:40 +01:00
chaturbate	Merge branch 'dev' into camsoda	2018-10-30 19:06:20 +01:00
mfc	Ignore models for disabled sites in LocalRecorder	2018-10-26 14:16:17 +02:00
AbstractSite.java	Add possibility to disable sites	2018-10-25 20:11:25 +02:00
Site.java	Add possibility to disable sites	2018-10-25 20:11:25 +02:00