tree 0eede3f23ac06e5591535d312b47b139919b1207
parent d9aa29bcf51df90629bc33225d8c1150cec1359e
parent c04df42c17bbbb8dec546c37e84a8b5f583e6242
author Bertrand Gouny <bertrand.gouny@osixia.net> 1552553659 +0100
committer Bertrand Gouny <bertrand.gouny@osixia.net> 1552553659 +0100

Merge branch 'hotfix-1.2.4' into stable