SimPEG.MT Mergify.

Merge branch 'move2Simpeg' of https://github.com/simpeg/simpegmt into mt/dev

Conflicts:
	.gitignore
	.travis.yml
	LICENSE
	docs/conf.py
	docs/index.rst
	requirements.txt
	setup.py
This commit is contained in:
Rowan Cockett committed 2016-01-14 15:36:58 -08:00
commit 558e8879fe
28 files changed
+3595

No files matched your search

View File
Whitespace-only changes.
+1
View File
@@ -0,0 +1 @@
pass