lms/djangoapps/courseware · 2e3a918da27cef003ce479d9f57d6aca9f7741a4 · edx / edx-platform

Merge branch 'master' into ormsbee/verifyuser3 · 78acd083

Conflicts:
	common/djangoapps/course_modes/models.py
	lms/djangoapps/shoppingcart/models.py
	lms/djangoapps/shoppingcart/processors/CyberSource.py
	lms/djangoapps/shoppingcart/processors/tests/test_CyberSource.py
	lms/djangoapps/shoppingcart/tests/test_models.py
	lms/djangoapps/shoppingcart/tests/test_views.py
	lms/djangoapps/shoppingcart/urls.py
	lms/djangoapps/shoppingcart/views.py
	lms/envs/common.py
	lms/envs/dev.py
	lms/static/sass/base/_variables.scss

committed Sep 04, 2013

78acd083

Name	Last commit	Last update
..
features		Loading commit data...
management		Loading commit data...
migrations		Loading commit data...
mock_xqueue_server		Loading commit data...
tests		Loading commit data...
__init__.py		Loading commit data...
access.py		Loading commit data...
admin.py		Loading commit data...
courses.py		Loading commit data...
grades.py		Loading commit data...
masquerade.py		Loading commit data...
model_data.py		Loading commit data...
models.py		Loading commit data...
module_render.py		Loading commit data...
progress.py		Loading commit data...
tabs.py		Loading commit data...
urls.py		Loading commit data...
views.py		Loading commit data...