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

Conflicts:
	common/lib/xmodule/xmodule/css/capa/display.scss

2015-09-01 16:01:04 -04:00

..

acceptance

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

2015-09-01 16:01:04 -04:00

data

Strip aways slashes from the asset 'displayname' as they cause export to fail.

2015-08-07 18:10:26 +05:00

db_cache

Merge pull request #8262 from open-craft/tpa-pipeline-consolidation

2015-06-19 09:12:11 -04:00

db_fixtures

Fixed video bumper tests.

2015-08-26 14:50:56 +05:00

templates

dummy theme templates for testing

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

test_microsites

Allow microsites to use logistration page (ECOM-1976)

2015-07-31 09:33:59 -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

Improve teams test run times by skipping signals

2015-08-27 16:08:54 -04:00