Joel Kåberg d49c663c64 Merge branches 'develop' and 'manual_scan' of https://github.com/RuudBurger/CouchPotatoServer into manual_scan ...

Conflicts:
	couchpotato/core/plugins/renamer/main.py

2013-12-16 07:29:31 +01:00

..

about.js

Make iframe https

2013-10-12 23:12:45 +02:00

home.js

Better frontend notification and GUI updating

2013-11-22 23:00:33 +01:00

manage.js

Indentation cleanup

2013-11-22 01:34:50 +01:00

settings.js

Better (custom) formhints

2013-11-30 14:59:52 +01:00

wanted.js

Manual scan folder cleanup

2013-11-16 14:29:34 +01:00