Merge pull request #10694 from edx/hotfix-2015-11-20-conflict (dffcc25b) · 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

dffcc25b

Commit dffcc25b authored 9 years ago by Kevin Falcone

Downloads
- Plain Diff

Merge pull request #10694 from edx/hotfix-2015-11-20-conflict

Hotfix 2015 11 20 conflict

parents 7c7c0b68 80614a27

Loading

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

common/djangoapps/third_party_auth/management/commands/saml.py 4 additions, 6 deletions

...n/djangoapps/third_party_auth/management/commands/saml.py
common/test/acceptance/tests/lms/test_lms_problems.py 92 additions, 2 deletions

common/test/acceptance/tests/lms/test_lms_problems.py
lms/static/js/ajax-error.js 2 additions, 2 deletions

lms/static/js/ajax-error.js

with 98 additions and 10 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