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

..

base.txt

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

2014-05-16 14:01:20 -04:00

edx-private.txt

Upgrade JSDraw.

2014-04-10 12:01:02 -04:00

github.txt

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

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

local.txt

Make course ids and usage ids opaque to LMS and Studio [partial commit]

2014-05-08 07:40:25 -04:00

paver.txt

Added watchdog to Paver requirements

2014-04-18 15:38:26 -04:00

post.txt

reverting the upgrade

2014-05-13 10:36:07 -04:00

pre.txt

Dependency warning message on requirements files

2013-08-01 14:49:49 -04:00

repo.txt

moving requirements files to a directory that corresponds with the virtualenv name

2013-05-16 14:30:01 -04:00