common/djangoapps/pipeline_mako · 58543bd84b451c1da7497633e9550a3d6538e0c1 · edx / edx-platform · GitLab

History Find file

Merge branch 'release/1.0' · d8f8d8c6
```
Conflicts:
	common/djangoapps/student/views.py
	lms/djangoapps/courseware/courses.py
```
Calen Pennington committed Jul 24, 2012
d8f8d8c6

Name	Last commit	Last update
..
templates		Loading commit data...
__init__.py		Loading commit data...