Merge branch 'series-grid' into vnext

Conflicts:
	UI/Config.js
This commit is contained in:
Mark McDowall 2013-04-09 20:17:41 -07:00
commit 35e2e83595
12 changed files with 157 additions and 19 deletions

View file

@ -22,6 +22,7 @@
<link href="/content/menu.css" rel='stylesheet' type='text/css'/>
<link href="/content/form.css" rel='stylesheet' type='text/css'/>
<link href="/content/settings.quality.css" rel='stylesheet' type='text/css'/>
<link href="/series/series.css" rel='stylesheet' type='text/css'/>
</head>
<body>
<div id="in-nav">