subtasks.py
26.8 KB
-
Merge remote-tracking branch 'origin/release' into adam/merge-release-into-master · 3aca0d54
Conflicts: common/djangoapps/student/models.py lms/djangoapps/bulk_email/tasks.py
Adam Palay committed
Conflicts: common/djangoapps/student/models.py lms/djangoapps/bulk_email/tasks.py