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

..

core

Merge branch 'refs/heads/develop' into nosql

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

static

Merge branch 'refs/heads/develop' into nosql

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

templates

Add filter on database manage page

2014-02-12 21:14:06 +01:00

__init__.py

database manage init

2014-02-11 22:19:55 +01:00

api.py

database manage init

2014-02-11 22:19:55 +01:00

environment.py

database manage init

2014-02-11 22:19:55 +01:00

runner.py

Migration start

2014-02-14 19:36:23 +01:00