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)

Trivial merge