Merge branch 'release/2.1.0' into develop
authorChocobozzz <me@florianbigard.com>
Wed, 29 Jan 2020 13:42:02 +0000 (14:42 +0100)
committerChocobozzz <me@florianbigard.com>
Wed, 29 Jan 2020 13:42:02 +0000 (14:42 +0100)
commitd5692d4088cdd9fde3be6ff34be8ce2816dab0cf
treee221a976773fd4365903f9bbf5e251cb729d211d
parentcf59a2a0c367683ba35758419499bf6087c192ec
parent9c9a16678354f737144ce2156ce0b7e4faa97eac
Merge branch 'release/2.1.0' into develop