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

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

Browse Source 
Conflicts:
	cms/djangoapps/contentstore/views/course.py
This commit is contained in:
Adam Palay
2015-06-12 16:22:06 -04:00
parent 83fce4d61f 21e338f743
commit b199a72c62
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cms/djangoapps/contentstore/views/course.py
View File

@@ -1032,7 +1032,6 @@ def _refresh_course_tabs(request, course_module):
"""
tab_panel = {
"type": tab_type.type,
"name": tab_type.title,
}
has_tab = tab_panel in tabs
if tab_enabled and not has_tab: