Ruud 3e035f84b1 Merge branch 'refs/heads/develop' into tv ...

Conflicts:
	couchpotato/core/helpers/variable.py
	couchpotato/core/media/_base/searcher/main.py
	couchpotato/core/media/movie/searcher/main.py
	couchpotato/core/plugins/quality/main.py
	couchpotato/core/plugins/release/main.py
	couchpotato/core/plugins/renamer/main.py

2013-11-24 23:13:25 +01:00

..

core

Merge branch 'refs/heads/develop' into tv

2013-11-24 23:13:25 +01:00

static

Merge branch 'refs/heads/develop' into tv

2013-11-24 23:13:25 +01:00

templates

Add mobile web capable for Android

2013-11-18 23:03:40 +01:00

__init__.py

Only show login when both username and password are filled in. fix #2157

2013-09-14 11:41:16 +02:00

api.py

Changed MIME type of JSONP requests to text/javascript

2013-10-12 07:11:37 -04:00

environment.py

Code cleanup

2013-09-02 21:59:06 +02:00

runner.py

Merge branch 'refs/heads/develop' into tv

2013-09-23 22:14:06 +02:00