Eric Fischer 813b50aed2 Fix conflict, 1.1.3 is correct

2016-04-07 14:45:19 -04:00

..

base.txt

Bump version for edx/django-oauth2-provider that includes in-sync migrations.

2016-04-07 12:26:18 +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

Wl-389

2016-04-01 13:02:16 +05:00

github.txt

Fix conflict, 1.1.3 is correct

2016-04-07 14:45:19 -04:00

local.txt

Consistently ensure dog_stats_api tags are formatted correctly

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

paver.txt

Speed up SASS compilation with libsass

2016-01-29 12:30:55 -05: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