4 Commits

Author	SHA1	Message	Date
JonahStanley	e8b2789409	Fixed upload test. Also added information to testing.md	2013-08-08 11:32:30 -04:00
Julian Arni	9f4b7261a8	Merge branch 'master' into jkarni/docs-merge	2013-08-01 11:41:44 -04:00
Julian Arni	c0f6ec6cf5	Merge branch 'master' into jkarni/docs-merge ... Conflicts: docs/source/conf.py	2013-07-30 10:23:35 -04:00
Julian Arni	bf60b24aa8	Switch to common structure and shared resources	2013-07-16 13:01:12 -04:00