Mark Hoeber 9aa2e2a1d1 Fixing conflicts ...

didn't see conflicts noted

2013-12-12 16:39:45 -05:00

..

course_authors

Fixing conflicts

2013-12-12 16:39:45 -05:00

data

Resolve conflicts merging master to rc/2013-11-21

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

developers

Add special cases to doc.

2013-10-23 12:37:11 +03:00

internal

settings.MITX_FEATURES => settings.FEATURES

2013-12-03 15:34:55 -05:00

shared

Add mock package to RTD requirements

2013-09-12 10:56:47 -04:00

source

Use XBlock 0.3

2013-09-06 09:45:59 -04:00

__init__.py

Switch to common structure and shared resources

2013-07-16 13:01:12 -04:00

Makefile

Add verbose option

2013-08-06 14:00:31 -04:00