Andy Armstrong fe6668a550 Merge branch 'release' ...

Conflicts:
	common/lib/xmodule/xmodule/video_module/video_module.py
	requirements/edx/github.txt

2014-09-23 15:53:10 -04:00

..

acceptance

Merge branch 'release'

2014-09-23 15:53:10 -04:00

data

Importable python_lib.zip assets

2014-09-18 17:59:12 -04:00

db_cache

Enable third party auth in LMS acceptance tests

2014-09-10 16:23:09 -04:00

db_fixtures

Acceptance test for language selector

2014-02-14 10:32:11 -05:00

templates

dummy theme templates for testing

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

test_microsites

This PR addresses the open feedback on the Microsites feature

2014-02-28 16:27:12 -05:00