Merge branch 'master' into feature/constantq
authorPaul Brossier <piem@piem.org>
Mon, 26 Nov 2018 21:33:30 +0000 (22:33 +0100)
committerPaul Brossier <piem@piem.org>
Mon, 26 Nov 2018 21:33:30 +0000 (22:33 +0100)
commitf87e19107444c8fbed1bbf71689bb9f83d8af4cb
tree07b8a2502b7a640e63d59ca805d9ce7e52ca46b5
parentd1d4ad4d563bdcac35aa688f139a42e8fc384900
parentdb3eb5c0b4af15b5ce9c9875c76fd6603775abf6
Merge branch 'master' into feature/constantq