Merge remote-tracking branch 'upstream/master' into toc

2012-05-22 12:14:03 -07:00
parent 5f5187e05c 5db1728a3f
commit e77154bf7a
30 changed files with 1418 additions and 287 deletions
@@ -7,6 +7,8 @@
    </li>
    <li class="minibutton"><a href="/pages"
      class="action-all-pages">All Pages</a></li>
+    <li class="minibutton"><a href="/fileview"
+    class="action-all-pages">File View</a></li>
    <li class="minibutton" class="jaws">
      <a href="#" id="minibutton-new-page">New Page</a></li>
    {{#editable}}