Merge branch 'master' into feature/pydocstrings
authorPaul Brossier <piem@piem.org>
Fri, 7 Dec 2018 12:16:37 +0000 (13:16 +0100)
committerPaul Brossier <piem@piem.org>
Fri, 7 Dec 2018 12:16:37 +0000 (13:16 +0100)
commite45345d9d7d91266e02d43c5cdf5c7f8aeab03b6
treeb95af76bb89eff658e1ef1669c2a4956794ada45
parentd91566e42c5a61253d27f1b9885bc190f8b6a1fc
parentdd474317079df5628ff6f5a4d70dad61368720d1
Merge branch 'master' into feature/pydocstrings