Merge branch 'master' into feature/pytest
authorPaul Brossier <piem@piem.org>
Sat, 1 Dec 2018 09:57:07 +0000 (10:57 +0100)
committerPaul Brossier <piem@piem.org>
Sat, 1 Dec 2018 09:57:07 +0000 (10:57 +0100)
commitadc6e02ecf2d72a827822e7d09b519434e66376a
tree9721bfdd124d2619388e05785ce19ace87b41c02
parentbbfa9a42e9ea4786c187774437f2553f34c019bb
parentbde4f641feff4cabff716064342ce600d762ce4d
Merge branch 'master' into feature/pytest
Makefile