Files
edx-platform/lms/templates
muhammad-ammar 8d5f153201 Merge remote-tracking branch 'origin/release' into dj18-release-merge
Conflicts:
	common/djangoapps/util/testing.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/teams/tests/test_views.py
	openedx/core/djangoapps/programs/models.py
	openedx/core/djangoapps/user_api/accounts/tests/test_views.py
	requirements/edx/github.txt
2015-11-18 17:53:44 +05:00
..
2015-10-19 11:10:21 +05:00
2015-11-05 07:26:13 +00:00
2015-09-14 14:34:05 -04:00
2015-07-21 10:54:02 -04:00
2015-11-13 15:23:02 +05:00
2015-04-24 09:45:12 -04:00
2015-10-02 16:57:23 +05:00
2015-11-16 20:57:13 +05:00
2015-11-01 18:16:16 -05:00
2015-09-17 15:39:03 -04:00
2015-09-29 17:01:55 +05:00
2015-09-29 13:02:10 -04:00
2015-05-31 14:45:31 +03:00