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

bfcfbfab

Commit bfcfbfab authored 10 years ago by Adam Palay

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/release' into merge-release-into-master

Conflicts:
	requirements/edx/github.txt

parents 869b407e 13c36c90

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

common/djangoapps/embargo/tests/test_middleware.py 1 addition, 1 deletion

common/djangoapps/embargo/tests/test_middleware.py
common/static/js/vendor/noreferrer.js 10 additions, 0 deletions

common/static/js/vendor/noreferrer.js
lms/templates/footer-edx-new.html 8 additions, 6 deletions

lms/templates/footer-edx-new.html
lms/templates/static_templates/embargo.html 2 additions, 4 deletions

lms/templates/static_templates/embargo.html
requirements/edx/github.txt 1 addition, 1 deletion

requirements/edx/github.txt

with 22 additions and 12 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