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

212598e6

Commit 212598e6 authored 10 years ago by christopher lee

Downloads
- Plain Diff

Merge branch 'release'

Conflicts:
	lms/djangoapps/mobile_api/course_info/tests.py

parents 526fdf01 e8ffbb15

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

common/djangoapps/static_replace/__init__.py 49 additions, 14 deletions

common/djangoapps/static_replace/__init__.py
common/djangoapps/static_replace/test/test_static_replace.py 38 additions, 2 deletions

common/djangoapps/static_replace/test/test_static_replace.py
lms/djangoapps/mobile_api/course_info/tests.py 91 additions, 11 deletions

lms/djangoapps/mobile_api/course_info/tests.py
lms/djangoapps/mobile_api/course_info/views.py 23 additions, 4 deletions

lms/djangoapps/mobile_api/course_info/views.py

with 201 additions and 31 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