Merge branch 'master' of github.com:MITx/mitx into merge

Conflicts: lms/urls.py
2012-08-07 16:58:14 -04:00
parent 272c7b8b0c 165ffe0a4d
commit 2fb02f1a73
56 changed files with 1271 additions and 1762 deletions
--- a/lms/templates/main.html
+++ b/lms/templates/main.html
@@ -26,9 +26,9 @@
  <%include file="navigation.html" />
  <section class="content-wrapper">
    ${self.body()}
+    <%block name="bodyextra"/>
  </section>

-  <%block name="bodyextra"/>
  <%include file="footer.html" />

  <%static:js group='application'/>