Merge branch 'refs/heads/develop' into tv

Conflicts:
	couchpotato/core/media/_base/searcher/main.py
	couchpotato/core/plugins/renamer/main.py
This commit is contained in:
Ruud committed 2013-10-03 08:17:20 +02:00
commit 1b59fd9af0
42 files changed
+833 -219

No files matched your search

+1 -1
View File
@@ -542,7 +542,7 @@
line-height: 140%;
cursor: help;
}
.page .combined_table .head abbr.use, .page .combined_table .head abbr.automation_urls_use {
.page .combined_table .head abbr:first-child {
display: none;
}
.page .combined_table .head abbr.host {