Ned Batchelder c8a7b259ff Resolve conflicts merging master to rc/2013-11-21

2013-11-27 11:55:44 -05:00

..

course_data_formats

Added user documentation

2013-08-12 11:49:04 -04:00

internal_data_formats

Remove code related to Pearson Testing Centers

2013-11-26 17:04:19 -05:00

conf.py

Remove django.utils dependency

2013-08-02 08:08:51 -04:00

index.rst

Add grading functionality to LTI xmodule

2013-11-26 16:30:55 -05:00