cms · a19fa0b031882a01ed0340157b8c39a6c89c9af9 · edx / edx-platform

Merge remote-tracking branch 'origin/feature/nate/simple-chat' into… · 886c9880

Merge remote-tracking branch 'origin/feature/nate/simple-chat' into edx-west/release-candidate-20130613

Conflicts:
	lms/templates/courseware/accordion.html
	lms/templates/courseware/course_navigation.html
	lms/templates/courseware/progress.html
	lms/templates/navigation.html

committed Jun 13, 2013

886c9880

Name	Last commit	Last update
..
djangoapps		Loading commit data...
envs		Loading commit data...
static		Loading commit data...
templates		Loading commit data...
.coveragerc		Loading commit data...
CHANGELOG.md		Loading commit data...
__init__.py		Loading commit data...
manage.py		Loading commit data...
one_time_startup.py		Loading commit data...
pydev_manage.py		Loading commit data...
urls.py		Loading commit data...
xmodule_namespace.py		Loading commit data...