Files
edx-platform/doc
Calen Pennington 8a9ba79d1f Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
Conflicts:
	cms/djangoapps/contentstore/views.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
	common/lib/xmodule/xmodule/peer_grading_module.py
2013-03-06 12:15:07 -05:00
..
2013-03-05 17:51:44 -05:00
2012-06-13 10:18:54 -04:00
2013-01-03 11:22:21 -05:00

This directory contains some high level documentation for the code.  We should strive to keep it up-to-date, but don't take it as the absolute truth.

A good place to start is 'overview.md'