tomkat83 08a0c38704 Resolving merge conflict		2016-01-10 12:38:49 +01:00
..
language	Correct string	2015-12-30 21:02:37 -06:00
lib	Resolving merge conflict	2016-01-10 12:38:49 +01:00
skins/default	lable change cinema mode	2015-06-07 12:08:57 +01:00
__init__.py	initial commit - first version	2015-03-13 22:24:59 +01:00
settings.xml	Merge remote-tracking branch 'MediaBrowser/master' into develop	2016-01-10 12:36:15 +01:00