Calen Pennington 8a9ba79d1f Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged ...

Conflicts:
	cms/djangoapps/contentstore/views.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
	common/lib/xmodule/xmodule/peer_grading_module.py

2013-03-06 12:15:07 -05:00

..

djangoapps

Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged

2013-03-06 12:15:07 -05:00

envs

Merge branch 'master' into feature/deena/testing

2013-03-04 16:30:41 -05:00

static

Merge pull request #1581 from MITx/feature/vik/advanced-studio

2013-03-05 12:28:29 -08:00

templates

Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged

2013-03-06 12:15:07 -05:00

__init__.py

Pep8 autofixes

2013-02-06 11:13:50 -05:00

.coveragerc

Change coverage report config to reflect refactoring of terrain files

2013-02-20 09:53:12 -05:00

CHANGELOG.md

Add changelog information

2012-11-06 10:34:51 -05:00

manage.py

Pep8 autofixes

2013-02-06 11:13:50 -05:00

urls.py

Get Save and Cancel working.

2013-02-19 17:08:10 -05:00

xmodule_namespace.py

Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged

2013-03-04 16:33:40 -05:00