Adam Palay c37715a7c7 Merge remote-tracking branch 'origin/release' into merge-release-into-master ...

Conflicts:
	requirements/edx/base.txt
	requirements/edx/github.txt

2016-01-26 11:25:41 -05:00

..

base.txt

Merge remote-tracking branch 'origin/release' into merge-release-into-master

2016-01-26 11:25:41 -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

Revert "Bump Problem Builder Hash"

2016-01-22 10:47:39 -05:00

github.txt

Merge remote-tracking branch 'origin/release' into merge-release-into-master

2016-01-26 11:25:41 -05:00

local.txt

Consistently ensure dog_stats_api tags are formatted correctly

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

paver.txt

Upgrade Paver to 1.2.4

2015-10-09 11:30:53 -04:00

post.txt

Instead of listing devops, use our group

2015-11-25 13:47:56 -05:00

pre.txt

Merge pull request #10717 from nikolas/patch-2

2015-12-03 09:30:18 -05:00