Ned Batchelder c8a7b259ff Resolve conflicts merging master to rc/2013-11-21

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

..

base.txt

Merge pull request #1685 from edx/jbau/shopping-cart/report

2013-11-26 11:45:59 -08:00

github.txt

Enable un-authenticated handler urls

2013-11-26 16:29:34 -05: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