doc · bc4d5f413d3da580c32c4b5e2395f68d37f47f64 · edx / edx-platform · GitLab

History Find file

Merge remote-tracking branch 'origin/master' into feature/cale/cms-master · dbcb1adf
```
Conflicts:
	lms/static/sass/course/courseware/_courseware.scss
```
Calen Pennington committed Nov 13, 2012
dbcb1adf

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...