lms/static · 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
..
admin		Loading commit data...
candy_res		Loading commit data...
coffee		Loading commit data...
contrib		Loading commit data...
css/vendor		Loading commit data...
files		Loading commit data...
fonts		Loading commit data...
images		Loading commit data...
js		Loading commit data...
maintenance		Loading commit data...
sass		Loading commit data...
scripts		Loading commit data...
staff		Loading commit data...
.gitignore		Loading commit data...
.hgignore		Loading commit data...
green-pointer.png		Loading commit data...
pixel.jpg		Loading commit data...