Merge branch 'master' into dev

This commit is contained in:
calzoneman 2013-08-06 20:42:01 -04:00
commit d965d0a5b6
3 changed files with 17 additions and 22 deletions

View file

@ -106,7 +106,7 @@
<div class="well well-small span12 row-fluid">
<div class="span12 pointer" id="librarytoggle">
<i class="icon-plus pull-left"></i>
<p>Show Library</p>
<p>Show Library/YouTube Search</p>
</div>
<div id="librarywrap">
<div class="span7" id="querywrap">