Eric Fischer 50d55bbad6 Merge branch 'release' into release-10-06-conflict

2016-10-06 14:25:47 -04:00

..

acceptance

Merge branch 'release' into release-10-06-conflict

2016-10-06 14:25:47 -04:00

data

Revert "Merge pull request #13614 from edx/efischer/revert_grades"

2016-10-06 14:25:27 -04:00

db_cache

Delete XBlockDisableConfig model.

2016-07-26 15:49:34 -04:00

db_fixtures

Implement Site settings for Third Party Auth providers

2016-09-26 12:43:00 -04:00

templates

dummy theme templates for testing

2014-06-26 10:37:58 -04:00

test_sites

1. Merge microsites into Comprehensive Theming

2016-07-27 13:55:14 +05:00

test-theme

AC-570 courseware search contrast enhancement

2016-08-30 14:51:54 -04:00

__init__.py

Run pylint on all our code, and only our code. TE-855

2015-05-04 15:23:55 -04:00

utils.py

Add OpenStack Swift support

2016-07-05 17:31:59 +03:00