Merge dev into dbrefactor

This commit is contained in:
calzoneman 2013-08-19 00:24:48 -05:00
commit 8b3ae3b546
14 changed files with 197 additions and 151 deletions

View file

@ -149,6 +149,7 @@
Quality <span class="caret"></span>
</a>
<ul class="dropdown-menu">
<li><a id="quality_auto" href="javascript:void(0)">Quality: Auto</a></li>
<li><a id="quality_240p" href="javascript:void(0)">240p</a></li>
<li><a id="quality_360p" href="javascript:void(0)">360p</a></li>
<li><a id="quality_480p" href="javascript:void(0)">480p</a></li>