Calen Pennington 8f72394e81 Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master ...

Conflicts:
	cms/templates/widgets/header.html

2014-05-19 09:20:08 -04:00

..

en_us

Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master

2014-05-19 09:20:08 -04:00

shared

Add mock package to RTD requirements

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

__init__.py

Switch to common structure and shared resources

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

config.ini

Added new context sensitive link and updated text

2014-05-16 20:38:09 -04:00