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

Conflicts:
	couchpotato/core/database.py

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

..

about.js

Merge branch 'refs/heads/develop' into desktop

2014-06-23 19:01:58 +02:00

home.js

Don't load suggestions when chartview active

2014-10-04 21:48:46 +02:00

settings.js

Safari hanging on password input creation

2014-10-04 15:37:18 +02:00