Merge branch 'release/v1.2.0' into develop
authorChocobozzz <me@florianbigard.com>
Wed, 6 Feb 2019 12:41:17 +0000 (13:41 +0100)
committerChocobozzz <me@florianbigard.com>
Wed, 6 Feb 2019 12:41:17 +0000 (13:41 +0100)
commit552dd3306fe867d8be30508ef9f30a1738241082
tree37cce63157ea13299b9fb2749bb9efb6e6d43c5b
parent9fb6cfc49b38d006d1d25e09efedf15f87c44310
parentf5305c04aae14467d6f957b713c5a902275cbb89
Merge branch 'release/v1.2.0' into develop