Merge branch 'refs/heads/develop' into redesign

Conflicts: couchpotato/static/scripts/couchpotato.js
2014-05-11 20:25:15 +02:00
parent 05a97a19ab 1ac01456a9
commit 58acd53a9a
65 changed files with 1204 additions and 388 deletions
@@ -2,6 +2,7 @@ Page.Userscript = new Class({

 	Extends: PageBase,

+	order: 80,
 	name: 'userscript',
 	has_tab: false,