Merge branch 'release' from 2014-08-12 release. (ee836d4c) · Commits · Hsin-Yu Chien / edx-platform-release · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

E

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

Snippets Groups Projects

ee836d4c

Commit ee836d4c authored 10 years ago by cahrens

Downloads
- Plain Diff

Merge branch 'release' from 2014-08-12 release.

parents e727bd22 ad37d93d

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.rst 2 additions, 0 deletions

CHANGELOG.rst
cms/djangoapps/models/settings/course_metadata.py 0 additions, 2 deletions

cms/djangoapps/models/settings/course_metadata.py
common/lib/xmodule/xmodule/modulestore/inheritance.py 2 additions, 1 deletion

common/lib/xmodule/xmodule/modulestore/inheritance.py
common/static/js/vendor/ova/flagging-annotator.js 3 additions, 2 deletions

common/static/js/vendor/ova/flagging-annotator.js
lms/envs/common.py 4 additions, 1 deletion

lms/envs/common.py
lms/templates/main.html 2 additions, 0 deletions

lms/templates/main.html
lms/templates/mktg_iframe.html 2 additions, 0 deletions

lms/templates/mktg_iframe.html
lms/templates/widgets/optimizely.html 3 additions, 0 deletions

lms/templates/widgets/optimizely.html

with 18 additions and 6 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