Victor Shnayder 6847779f22 Merge remote-tracking branch 'origin/master' into feature/victor/cohorts ...

Conflicts:
	common/djangoapps/student/models.py

2013-01-26 12:37:26 -05:00

..

__init__.py

Get the cms up to the point of rendering a template

2012-06-08 14:01:41 -04:00

acceptance.py

Set up the framework for running lettuce tests against studio

2013-01-08 14:44:45 -05:00

aws.py

Set SESSION_COOKIE_DOMAIN from env.json

2012-10-11 12:32:23 -04:00

common.py

Merge remote-tracking branch 'origin/master' into feature/victor/cohorts

2013-01-26 12:37:26 -05:00

dev_ike.py

minor change in dev_ike for cms-master

2012-10-14 16:58:11 -04:00

dev.py

Make separate links for lms_preview and lms as needed

2012-10-12 15:03:06 -04:00

jasmine.py

Make jasmine testing quieter

2012-11-13 10:55:17 -05:00

test.py

Merge pull request #1208 from MITx/feature/cdodge/clone-course

2012-12-27 09:26:51 -08:00