Files
edx-platform/lms/templates/instructor
Diana Huang 79fea6205e Merge branch 'release'
Conflicts:
	lms/static/coffee/src/instructor_dashboard/membership.coffee
	lms/templates/instructor/instructor_dashboard_2/membership.html
	requirements/edx/github.txt
2014-04-16 15:41:59 -04:00
..