David Ormsbee 48f867bd6b Merge branch 'master' into ormsbee/verifyuser3 ...

Conflicts:
	lms/envs/common.py

2013-09-09 10:18:25 -04:00

..

__init__.py

Move terrain module from lms to common.

2013-02-20 09:52:32 -05:00

browser.py

Fix for acceptance test static file issue

2013-09-03 11:36:23 -04:00

course_helpers.py

LMS acceptance tests use mixed modulestore

2013-08-21 16:23:48 -04:00

factories.py

Initial BDD spec for certificates workflow

2013-09-03 10:46:32 -04:00

steps.py

Disable pylint violation E0611 when importing assert_* methods from nose.tools

2013-08-27 16:21:33 -04:00

ui_helpers.py

Disable pylint violation E0611 when importing assert_* methods from nose.tools

2013-08-27 16:21:33 -04:00