Merge branch 'master' into dev

2013-08-04 11:46:33 -04:00 · 2013-08-04 11:46:33 -04:00 · 0aa8e0f930
commit 0aa8e0f930
parent bdaa76295e 15085fc6ae
6 changed files with 11 additions and 9 deletions
--- a/www/channel.html
+++ b/www/channel.html
@ -213,6 +213,10 @@
        </div>
        </div>
        </div>
+        <div class="row" id="resizewrap">
+          <div class="span5"></div>
+          <div class="span7" id="videowidth"></div>
+        </div>
      </div>
    <div class="push"></div>
    <div id="sitefooter">