Merge branch 'master' into feature/pytest
authorPaul Brossier <piem@piem.org>
Thu, 22 Nov 2018 17:41:41 +0000 (18:41 +0100)
committerPaul Brossier <piem@piem.org>
Thu, 22 Nov 2018 17:41:41 +0000 (18:41 +0100)
commite893e6fe954265cd404fd49b4676db50a558d4d0
treeb8d56a1c7e7c5491ce2a0a9a3ca5b561b41fdc73
parentbf3f09b5a18deb2d308292b855e895ec86d85ca0
parentc4a8bc138e49de8b43fcd2221ef84dfa5073208f
Merge branch 'master' into feature/pytest
MANIFEST.in
Makefile
doc/python_module.rst
setup.py