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

Conflicts:
	requirements/edx/github.txt

2015-05-12 15:13:28 -04:00

..

acceptance

Look for a consistent css class.

2015-05-12 13:38:05 -04:00

data

edx-val-Fix VAL error on re-import

2015-05-11 20:00:55 +05:00

db_cache

Include VAL data in video module export/import

2015-03-31 19:35:06 -04:00

db_fixtures

TNL-213: Let Students Add Personal Notes to Course Content.

2015-01-14 23:34:11 +02:00

templates

dummy theme templates for testing

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

test_microsites

Merge pull request #6484 from edx/sarina/move-branded-lms-assets

2015-01-09 11:59:39 -05:00

__init__.py

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

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