David Ormsbee 48f867bd6b Merge branch 'master' into ormsbee/verifyuser3 ...

Conflicts:
	lms/envs/common.py

2013-09-09 10:18:25 -04:00

..

base.txt

Merge branch 'master' into ormsbee/verifyuser3

2013-09-09 10:18:25 -04:00

github.txt

Merge pull request #844 from edx/dhm/editable_metadata

2013-09-06 11:58:36 -07:00

local.txt

Use XBlock 0.3

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

post.txt

Dependency warning message on requirements files

2013-08-01 14:49:49 -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