doc · ccf2cff2bafb18dcfe6d5caeab8bd78cf6816af3 · edx / edx-platform · GitLab

History Find file

Merge branch 'master' into profile · 238adb1a

Conflicts:
	lms/djangoapps/django_comment_client/forum/views.py
	lms/templates/course_navigation.html

committed Aug 18, 2012

Name	Last commit	Last update
..
README		Loading commit data...
code_standards.txt		Loading commit data...
development.md		Loading commit data...
discussion.md		Loading commit data...
overview.md		Loading commit data...
testing.md		Loading commit data...
xml-format.md		Loading commit data...