Merge branch 'master' into feature/constantq
authorPaul Brossier <piem@piem.org>
Sun, 31 Mar 2019 19:58:02 +0000 (21:58 +0200)
committerPaul Brossier <piem@piem.org>
Sun, 31 Mar 2019 19:58:02 +0000 (21:58 +0200)
commitdfe6ab6e0f9435760a03e087d872e8faf64c3921
treef7b5ad2c9d3aa8c0f21e6d0622b5a752bf67354b
parent868c6b81350308a360778d6cd97ba7c4ffc4ca13
parentf55630c5e9397c94d3f0e683c6eeb2c89fd6d490
Merge branch 'master' into feature/constantq