JonahStanley 0524ff53cc Merge branch 'master' into jonahstanley/add-courseteam-tests ...

Conflicts:
	cms/djangoapps/contentstore/features/common.py

2013-06-19 11:29:43 -04:00

..

features

Merge branch 'master' into jonahstanley/add-courseteam-tests

2013-06-19 11:29:43 -04:00

management

remove invalid comments

2013-06-17 11:10:36 -04:00

tests

Incidental pep8 changes

2013-06-18 17:25:06 -04:00

views

Incidental pep8 changes

2013-06-18 17:25:06 -04:00

__init__.py

move call to update_templates on service startup into a django-admin command

2013-03-04 08:06:58 -05:00

course_info_model.py

violation fixes

2013-04-12 15:27:36 -04:00

module_info_model.py

Incidental pep8 changes

2013-06-18 17:25:06 -04:00

utils.py

Incidental pep8 changes

2013-06-18 17:25:06 -04:00