Merge branch 'release/1.4.0' into develop
authorChocobozzz <me@florianbigard.com>
Tue, 20 Aug 2019 12:19:21 +0000 (14:19 +0200)
committerChocobozzz <me@florianbigard.com>
Tue, 20 Aug 2019 12:19:21 +0000 (14:19 +0200)
commitee7ea34e6211d3b19a325e4fe8c464c24005bcac
treea9b2d3a10031a3f286be75015c3d2d98e99b4f16
parent13176a07a95984a53cc59aec5217f2ce9806d1bc
parent4ba5632266d0cdd54e8e09ac7416c2aa415eed65
Merge branch 'release/1.4.0' into develop