Merge branch 'feature/cdocstrings' into feature/docstrings
authorPaul Brossier <piem@piem.org>
Tue, 30 Oct 2018 14:22:41 +0000 (15:22 +0100)
committerPaul Brossier <piem@piem.org>
Tue, 30 Oct 2018 14:22:41 +0000 (15:22 +0100)

Trivial merge