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

944c4336

Commit 944c4336 authored 11 years ago by Sarina Canelake

Downloads
- Plain Diff

Merge branch 'release'

parents e3cef4e2 6aa5d2cc

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

common/lib/xmodule/xmodule/conditional_module.py 6 additions, 3 deletions

common/lib/xmodule/xmodule/conditional_module.py
common/lib/xmodule/xmodule/lti_module.py 1 addition, 1 deletion

common/lib/xmodule/xmodule/lti_module.py
common/lib/xmodule/xmodule/peer_grading_module.py 3 additions, 3 deletions

common/lib/xmodule/xmodule/peer_grading_module.py
common/lib/xmodule/xmodule/x_module.py 5 additions, 0 deletions

common/lib/xmodule/xmodule/x_module.py
lms/templates/conditional_module.html 2 additions, 6 deletions

lms/templates/conditional_module.html

with 17 additions and 13 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