resolving merge from feature/btalbot/studio-softlanding

2013-02-13 12:42:15 -05:00
parent 70e11e823c 03e7d2e77b
commit e13db29efc
395 changed files with 35659 additions and 3675 deletions
--- a/cms/templates/edit_subsection.html
+++ b/cms/templates/edit_subsection.html
@@ -137,6 +137,8 @@
  <script type="text/javascript" src="${static.url('js/models/course_relative.js')}"></script>
  <script type="text/javascript" src="${static.url('js/views/grader-select-view.js')}"></script>
  <script type="text/javascript" src="${static.url('js/models/settings/course_grading_policy.js')}"></script>
+  <script type="text/javascript" src="${static.url('js/views/overview.js')}"></script>
+  

 <script type="text/javascript">
    $(document).ready(function() {