Joel Kåberg 0a996857dd Merge branches 'develop' and 'tv' of https://github.com/RuudBurger/CouchPotatoServer into tv ...

Conflicts:
	couchpotato/core/plugins/release/main.py
	couchpotato/core/plugins/renamer/main.py

2013-12-19 20:57:12 +01:00

..

block

Javascript and css cleanup

2013-09-03 22:13:42 +02:00

library

Better (custom) formhints

2013-11-30 14:59:52 +01:00

page

Merge branches 'develop' and 'manual_scan' of https://github.com/RuudBurger/CouchPotatoServer into manual_scan

2013-12-16 07:29:31 +01:00

api.js

Javascript and css cleanup

2013-09-03 22:13:42 +02:00

block.js

Javascript and css cleanup

2013-09-03 22:13:42 +02:00

couchpotato.js

Merge branch 'refs/heads/develop' into tv

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

page.js

Javascript and css cleanup

2013-09-03 22:13:42 +02:00