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

Conflicts:
	requirements/edx/github.txt

2015-01-30 09:44:42 -05:00

..

base.txt

Courseware Search integration

2015-01-28 21:34:58 -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

Minor fixes to the schoolyourself xblock, including:

2015-01-08 20:47:53 -05:00

github.txt

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

2015-01-30 09:44:42 -05:00

local.txt

Consistently ensure dog_stats_api tags are formatted correctly

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

paver.txt

Revert "Testeng/jenkins revisited"

2014-12-31 12:25:54 -05:00

post.txt

Update contact info for licensing questions

2014-11-26 15:16:04 -05:00

pre.txt

Update contact info for licensing questions

2014-11-26 15:16:04 -05:00