Nimisha Asthagiri d7f850a764 Merge branch 'release' ...

Conflicts:
	lms/djangoapps/instructor/features/data_download.py

2014-10-07 16:23:28 -04:00

..

course_data_formats

Removed grading and drag'n'drop

2014-08-22 10:38:43 -04:00

Images

Edits from Michele

2014-07-10 11:05:40 -04:00

internal_data_formats

Merge branch 'release'

2014-10-07 16:23:28 -04:00

browsers.rst

Added browsers to data, developers, install, release notes

2014-08-20 09:23:32 -04:00

conf.py

Reorg of Research Guide

2014-05-05 10:48:29 -04:00

index.rst

Removed grading and drag'n'drop

2014-08-22 10:38:43 -04:00

preface.rst

Fixes: DOC-392, shared preface listing resources for different types of audiences

2014-06-20 16:42:06 -04:00

read_me.rst

Fixes: DOC-392, shared preface listing resources for different types of audiences

2014-06-20 16:42:06 -04:00