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

Revert "Merge pull request #15170 from edx/jeskew/PLAT_1316_partitions_inheritance"

Browse Source 
This reverts commit f97f052591, reversing
changes made to 800bcd8e20.
This commit is contained in:
John Eskew
2017-05-30 11:38:03 -04:00
parent d71a1d8887
commit 3b57542ab0
94 changed files with 1111 additions and 1086 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cms/djangoapps/models/settings/encoder.py
View File

@@ -7,7 +7,7 @@ from json.encoder import JSONEncoder
from opaque_keys.edx.locations import Location
from openedx.core.djangoapps.models.course_details import CourseDetails
from openedx.core.lib.xblock_fields.fields import Date
from xmodule.fields import Date
from .course_grading import CourseGradingModel