Ruud ff759dacf3 Merge branch 'refs/heads/develop' into desktop ...

Conflicts:
	couchpotato/core/_base/updater/main.py

2012-07-11 22:43:45 +02:00

..

core

Merge branch 'refs/heads/develop' into desktop

2012-07-11 22:43:45 +02:00

static

Notifications stick to bottom

2012-07-01 00:56:37 +02:00

templates

Styling cleanup

2012-06-30 22:06:53 +02:00

__init__.py

Redirect fix

2012-06-22 22:30:07 +02:00

api.py

Better locking for longpoll

2012-05-27 23:28:59 +02:00

environment.py

Do some default encoding on start. fix #520

2012-07-01 11:30:47 +02:00

runner.py

Use settings datadir again. fix #518

2012-07-01 00:43:34 +02:00