dev.py
6.3 KB
-
Merge remote-tracking branch 'origin/master' into feature/cale/cms-master · 0fff578e
Conflicts: .gitmodules lms/envs/aws.py lms/envs/common.py lms/static/sass/course.scss lms/urls.py
Calen Pennington committed
Conflicts: .gitmodules lms/envs/aws.py lms/envs/common.py lms/static/sass/course.scss lms/urls.py