Merge branch 'master' into feature/pytest
authorPaul Brossier <piem@piem.org>
Mon, 5 Nov 2018 14:43:02 +0000 (15:43 +0100)
committerPaul Brossier <piem@piem.org>
Mon, 5 Nov 2018 14:43:02 +0000 (15:43 +0100)
commit568fc6056c256200f7ccec8e6e50230b0e8822fb
tree473c28a2e38939f72667e29cee250b8da21cbd4b
parenta9e3bd03b1c01cc4974e7b0a7a9fa49c0a19caf4
parentbc1ed6368f0057be27c5aea0267e94f79884acea
Merge branch 'master' into feature/pytest
MANIFEST.in
setup.py