Merge branch 'release/v1.2.0'
authorChocobozzz <me@florianbigard.com>
Thu, 14 Feb 2019 12:17:10 +0000 (13:17 +0100)
committerChocobozzz <me@florianbigard.com>
Thu, 14 Feb 2019 12:17:10 +0000 (13:17 +0100)

Trivial merge