Calen Pennington d8f8d8c656 Merge branch 'release/1.0' ...

Conflicts:
	common/djangoapps/student/views.py
	lms/djangoapps/courseware/courses.py

2012-07-24 08:52:50 -04:00

..

templates

Use django-pipeline to read course static files.

2012-07-23 16:22:45 -04:00

__init__.py

Cleaning up pep8 violations

2012-07-23 14:44:40 -04:00