tree 565d96f199cbf0b00637b20a1ac0afabdf3121a5
parent b25e0a50d33507557a7a83164a19b080fdd03255
parent adc6dfb3b5951206c5d7b98ebff3158569a485a0
author Bertrand Gouny <bertrand.gouny@osixia.net> 1548105743 +0100
committer Bertrand Gouny <bertrand.gouny@osixia.net> 1548105743 +0100

Merge branch 'butonic-patch-1' into release-1.2.3