doc · bdebc60266f85d28e3729fc2c2fa333d589df2c7 · edx / edx-platform · GitLab

History Find file

Merge remote-tracking branch 'origin/master' into feature/cale/cms-master · 0fff578e
```
Conflicts:
	.gitmodules
	lms/envs/aws.py
	lms/envs/common.py
	lms/static/sass/course.scss
	lms/urls.py
```
Calen Pennington committed Nov 16, 2012
0fff578e

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