Ruud c657d6d70b Merge branch 'master' into desktop ...

Conflicts:
	couchpotato/core/database.py

2014-10-11 19:34:46 +02:00

..

fonts

Login styling

2013-09-10 22:58:41 +02:00

images

Fix handle image url

2014-03-22 23:01:03 +01:00

scripts

Merge branch 'master' into desktop

2014-10-11 19:34:46 +02:00

style

Allow typing in directory setting

2014-09-21 22:17:09 +02:00