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

Conflicts: lms/djangoapps/courseware/module_render.py lms/djangoapps/courseware/views.py lms/envs/common.py
2012-07-30 17:41:19 -04:00
parent e6776682df 3bb82c41d2
commit 8228bebc2a
89 changed files with 2372 additions and 857 deletions
--- a/lms/static/.gitignore
+++ b/lms/static/.gitignore
@@ -5,4 +5,5 @@
 *.orig
 *.DS_Store
 application.css
-ie.css
+ie.css
+Gemfile.lock
--- a/lms/static/images/correct-icon.png
+++ b/lms/static/images/correct-icon.png
--- a/lms/static/images/incorrect-icon.png
+++ b/lms/static/images/incorrect-icon.png
--- a/lms/static/images/unanswered-icon.png
+++ b/lms/static/images/unanswered-icon.png