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)
1  2 
MANIFEST.in

diff --cc MANIFEST.in
Simple merge