Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'course-info' into feature/dhm/cms-settings

Browse Source 
Conflicts:
	cms/djangoapps/contentstore/views.py
This commit is contained in:
Don Mitchell
2012-11-19 16:00:27 -05:00
parent 8c8be3e82a 842bbe92d1
commit a9233dfd44
11 changed files with 61 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
common/test/data/graded/course.xml
View File

@@ -1 +0,0 @@
roots/2012_Fall.xml

1
common/test/data/graded/course.xml Normal file
View File

@@ -0,0 +1 @@
<course org="edX" course="graded" url_name="2012_Fall"/>