Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jkarni/docs-merge

Browse Source 
Conflicts:
	docs/source/conf.py
This commit is contained in:
Julian Arni
2013-07-30 10:23:35 -04:00
parent 2540be2442 77a796e2c7
commit c0f6ec6cf5
1075 changed files with 42550 additions and 25704 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/data/source/index.rst
View File

@@ -29,6 +29,7 @@ Specific Problem Types
course_data_formats/word_cloud/word_cloud.rst
course_data_formats/custom_response.rst
course_data_formats/symbolic_response.rst
course_data_formats/jsinput.rst
Internal Data Formats