David Baumgold 69bc10235e Merge remote-tracking branch 'remotes/origin/release' into release-2015-10-01-resolve-merge-conflicts

2015-10-01 15:28:55 -04:00

..

base.txt

Merge pull request #9973 from edx/muzaffar/upgrade-django-filter

2015-09-30 20:20:21 +05:00

development.txt

First iteration of code which tests performance of asset metadata

2015-01-13 08:47:24 -05:00

edx-private.txt

Add Peer Instruction XBlock

2015-09-16 15:31:17 -07:00

github.txt

update reference to edx-proctoring to account for requested iconography changes from UX team. Also update test to conform with changes

2015-09-30 10:10:23 -04:00

local.txt

Consistently ensure dog_stats_api tags are formatted correctly

2014-10-09 12:35:26 -07:00

paver.txt

Update path.py to version 7.2

2015-03-20 09:51:05 -04:00

post.txt

Fix setuptools infinite loop bug triggered by python-saml

2015-07-30 16:23:04 -04:00

pre.txt

Upgrade setuptools to 18.0.1

2015-07-30 16:22:42 -04:00