Merge branch 'master' into feature/pytest
authorPaul Brossier <piem@piem.org>
Wed, 19 Dec 2018 16:50:42 +0000 (17:50 +0100)
committerPaul Brossier <piem@piem.org>
Wed, 19 Dec 2018 16:50:42 +0000 (17:50 +0100)
commit74c1fb9a63dfa46c0591816bd2f450c5f2dba751
treec62262e128fb227d16308cbd894cdf03e1ac784e
parentc1ba75b55fb6351ca1f2dcebf89b93aee72d2711
parentfda33947f11900fca0c3704a654d9afa6fc52224
Merge branch 'master' into feature/pytest
MANIFEST.in