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

Conflicts:
	docs/source/conf.py

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

..

course_authors

Switch to common structure and shared resources

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

data

Merge branch 'master' into jkarni/docs-merge

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

developers

Merge branch 'master' into jkarni/docs-merge

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

internal

Merge branch 'master' into jkarni/docs-merge

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

shared

Switch to common structure and shared resources

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

source

Merge branch 'master' into jkarni/docs-merge

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

__init__.py

Switch to common structure and shared resources

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

Makefile

Update rake docs to reflect change in folder structure

2013-07-16 13:45:22 -04:00