Julian Arni c0f6ec6cf5 Merge branch 'master' into jkarni/docs-merge ...

Conflicts:
	docs/source/conf.py

2013-07-30 10:23:35 -04:00

..

code_standards.txt

Switch to common structure and shared resources

2013-07-16 13:01:12 -04:00

development.md

Merge branch 'master' into jkarni/docs-merge

2013-07-30 10:23:35 -04:00

discussion.md

Merge branch 'master' into jkarni/docs-merge

2013-07-30 10:23:35 -04:00

mongo.md

Switch to common structure and shared resources

2013-07-16 13:01:12 -04:00

overview.md

Merge branch 'master' into jkarni/docs-merge

2013-07-30 10:23:35 -04:00

remote_gradebook.md

Switch to common structure and shared resources

2013-07-16 13:01:12 -04:00

test_pyramid.png

Switch to common structure and shared resources

2013-07-16 13:01:12 -04:00

testing.md

Merge branch 'master' into jkarni/docs-merge

2013-07-30 10:23:35 -04:00