Merge branch 'release/1.4.0' into develop
authorChocobozzz <me@florianbigard.com>
Thu, 22 Aug 2019 15:16:48 +0000 (17:16 +0200)
committerChocobozzz <me@florianbigard.com>
Thu, 22 Aug 2019 15:16:48 +0000 (17:16 +0200)
commit001ed2d40c8d2c8f494f5dc7f91ed62d56df10fd
tree9a88235affe49fce4b7ce2df192931cffaec32e9
parentd5c8932a601c1854db0a2e399ccaf26e17385f1a
parent60c2bc80b82c71bd63bdb1fcf64d4d49491ce5c8
Merge branch 'release/1.4.0' into develop