lms/templates/courseware · 7e2652b5a8ddaee31594634667293e0fa8967b31 · edx / edx-platform · GitLab

History Find file

Merge branch 'release' · 3885e6cf
```
Conflicts:
	lms/templates/help_modal.html
	lms/templates/index.html
```
Don Mitchell committed Jan 16, 2014
3885e6cf

Name	Last commit	Last update
..
accordion.html		Loading commit data...
course_about.html		Loading commit data...
course_navigation.html		Loading commit data...
courses.html		Loading commit data...
courseware-error.html		Loading commit data...
courseware.html		Loading commit data...
grade_summary.html		Loading commit data...
gradebook.html		Loading commit data...
info.html		Loading commit data...
instructor_dashboard.html		Loading commit data...
mktg_coming_soon.html		Loading commit data...
mktg_course_about.html		Loading commit data...
news.html		Loading commit data...
progress.html		Loading commit data...
progress_graph.js		Loading commit data...
static_tab.html		Loading commit data...
submission_history.html		Loading commit data...
syllabus.html		Loading commit data...
welcome-back.html		Loading commit data...
xqa_interface.html		Loading commit data...