Commit Graph
2 Commits
Author SHA1 Message Date
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
Ruud 96e8a909d8 database manage init 2014-02-11 22:19:55 +01:00