Ruud 6437079be3 Merge branch 'refs/heads/develop' into nosql ...

Conflicts:
	couchpotato/core/media/__init__.py
	couchpotato/core/notifications/trakt/main.py

2014-02-16 15:56:18 +01:00

..

about.js

Make iframe https

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

home.js

Nosql

2014-02-08 17:58:45 +01:00

manage.js

Improved manage scanning

2014-01-24 22:33:22 +01:00

settings.js

Fire events after tab add

2014-02-15 19:47:55 +01:00

wanted.js

Manual scan folder cleanup

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