Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

E

edx-platform-release
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

0a60881c

Commit 0a60881c authored 12 years ago by Bridger Maxwell

Downloads
- Plain Diff

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

parents 351ded6c 6abd1ec6

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

common/lib/capa/capa/templates/textbox.html 5 additions, 5 deletions

common/lib/capa/capa/templates/textbox.html
common/lib/xmodule/xmodule/js/src/capa/display.coffee 12 additions, 0 deletions

common/lib/xmodule/xmodule/js/src/capa/display.coffee
common/lib/xmodule/xmodule/x_module.py 2 additions, 1 deletion

common/lib/xmodule/xmodule/x_module.py
common/lib/xmodule/xmodule/xml_module.py 1 addition, 1 deletion

common/lib/xmodule/xmodule/xml_module.py
lms/djangoapps/courseware/module_render.py 6 additions, 4 deletions

lms/djangoapps/courseware/module_render.py
lms/static/sass/base/_base.scss 4 additions, 0 deletions

lms/static/sass/base/_base.scss
lms/templates/accordion.html 6 additions, 6 deletions

lms/templates/accordion.html

with 36 additions and 17 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment