edx-platform

Files

Bridger Maxwell 4fedca5bf9 Merge remote-tracking branch 'origin/master' into MITx/feature/bridger/fast_course_grading

Conflicts:
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/views.py

2012-08-06 16:49:05 -04:00

2012-08-06 16:36:53 -04:00

2012-07-23 14:44:40 -04:00

2012-08-01 11:40:12 -04:00

__init__.py

2012-06-06 14:09:01 -04:00

admin.py

2012-06-06 14:09:01 -04:00

courses.py

2012-08-06 14:10:00 -04:00

grades.py

2012-08-06 16:36:53 -04:00

models.py

2012-08-06 16:36:53 -04:00

module_render.py

2012-08-06 16:49:05 -04:00

progress.py

2012-07-23 14:44:40 -04:00

urls.py

2012-06-06 14:09:01 -04:00

views.py

2012-08-06 16:49:05 -04:00