Joel Kåberg d49c663c64 Merge branches 'develop' and 'manual_scan' of https://github.com/RuudBurger/CouchPotatoServer into manual_scan ...

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

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

..

api.css

Javascript and css cleanup

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

main.css

Fix menu phone styling

2013-09-10 23:50:17 +02:00

settings.css

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

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

uniform.css

Whitespace cleanup

2012-04-07 19:30:55 +02:00

uniform.generic.css

Javascript and css cleanup

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