D Fournier 66ee0f0422 Merge branch 'dev' into pf/dev ...

Conflicts:
	.gitignore
	SimPEG/Examples/__init__.py

2016-06-30 13:55:57 -07:00

..

_templates

use templates in conf.py, add google analytics to docs

2016-05-31 15:33:19 -07:00

content

Merge branch 'dev' into pf/dev

2016-06-30 13:55:57 -07:00

images

start of gae site

2016-05-30 22:01:15 -07:00

app.yaml

start of gae site

2016-05-30 22:01:15 -07:00

conf.py

Merge branch 'dev' into pf/dev

2016-06-30 13:55:57 -07:00

credentials.tar.gz.enc

add encrypted credentials for gae site and decrypt on travis

2016-05-31 23:03:55 -07:00

index.rst

Merge branch 'dev' into pf/dev

2016-06-30 13:55:57 -07:00

index.yaml

start of gae site

2016-05-30 22:01:15 -07:00

make.bat

Added sphinx doc support. goto docs and type:

2013-08-30 22:41:02 -07:00

Makefile

Doc testing, I think that is most of them!

2016-05-29 22:18:22 -07:00

simpegdocs.py

start of gae site

2016-05-30 22:01:15 -07:00