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

Merge remote-tracking branch 'origin/master' into feature/cale/cms-master

Browse Source 
Conflicts:
	cms/djangoapps/contentstore/views.py
This commit is contained in:
Calen Pennington
2012-10-02 12:12:55 -04:00
parent a1b998691b fbba883c26
commit aff44b1f11
7 changed files with 275 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cms/envs/common.py
View File

@@ -282,6 +282,7 @@ INSTALLED_APPS = (
# For CMS
'contentstore',
'auth',
'github_sync',
'student', # misleading name due to sharing with lms