Adam Palay 4bb4efe9d9 Merge remote-tracking branch 'origin/release' into rc/2015-06-29 ...

Conflicts:
	requirements/edx/github.txt

2015-06-29 16:55:57 -04:00

..

base.txt

Bump python-social-auth and python-same to upstream's latest master - PR 8599

2015-06-26 13:24:00 -07:00

development.txt

First iteration of code which tests performance of asset metadata

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

edx-private.txt

Update commit hash for problem-builder.

2015-05-22 10:38:54 +02:00

github.txt

Merge remote-tracking branch 'origin/release' into rc/2015-06-29

2015-06-29 16:55:57 -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

Update devops in requirement file comments

2015-05-19 15:34:26 -04:00

pre.txt

Update devops in requirement file comments

2015-05-19 15:34:26 -04:00