Chris Dodge 99750a6812 make sure we turn off module wrappers for the 'ancillary' course content

2013-01-08 11:18:41 -05:00

..

features

Fixed tests to work OK so far.

2013-01-02 10:44:21 -05:00

management

…

migrations

…

tests

perform a new merge from master, resolve conflicts

2013-01-03 10:43:03 -05:00

__init__.py

…

access.py

perform a new merge from master, resolve conflicts

2013-01-03 10:43:03 -05:00

admin.py

…

courses.py

make sure we turn off module wrappers for the 'ancillary' course content

2013-01-08 11:18:41 -05:00

grades.py

…

models.py

Simple PEP8 issues.

2012-11-06 18:14:57 -05:00

module_render.py

perform a new merge from master, resolve conflicts

2013-01-03 10:43:03 -05:00

progress.py

…

tabs.py

perform a new merge from master, resolve conflicts

2013-01-03 10:43:03 -05:00

urls.py

…

views.py

perform a new merge from master, resolve conflicts

2013-01-03 10:43:03 -05:00