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

..

askbot/skins

Add extra_filters_jinja needed for compressed_css filter

2012-07-10 16:22:05 -04:00

djangoapps

Merge branch 'release/1.0'

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

envs

Convert @mitx.mit.edu emails to @edx.org emails

2012-07-23 23:43:34 -04:00

lib

Cleaning up pep8 violations

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

static

Merge branch 'release/1.0'

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

templates

Merge branch 'release/1.0'

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

__init__.py

…

urls.py

Merge branch 'release/1.0'

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