Andy Armstrong fe6668a550 Merge branch 'release' ...

Conflicts:
	common/lib/xmodule/xmodule/video_module/video_module.py
	requirements/edx/github.txt

2014-09-23 15:53:10 -04:00

..

base.txt

Merge branch 'release'

2014-09-23 15:53:10 -04:00

edx-private.txt

move to s3fs and handle one time url

2014-09-19 09:39:17 -04:00

github.txt

Merge branch 'release'

2014-09-23 15:53:10 -04:00

local.txt

Moved imports to startup.py.

2014-09-11 20:14:37 +05:00

paver.txt

Add memcache as a requirement for running paver, because it's imported in pavelib/utils/envs.py

2014-08-27 16:29:47 -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