Merge branch 'master' into license-update-2020
authorAlex Heneveld <alex.heneveld@cloudsoftcorp.com>
Tue, 2 Jun 2020 08:56:05 +0000 (09:56 +0100)
committerAlex Heneveld <alex.heneveld@cloudsoftcorp.com>
Tue, 2 Jun 2020 08:56:05 +0000 (09:56 +0100)
commitd5e10b2423b4018f8dd35be8cd04883359e576ea
tree9579c6d253bcc3bf2ea009e7a6335c4e42cb1ad9
parent2e8af80eb1f9431693e732ebd22b601f36f7327b
parent0f77fa1606b22f2a5e2dec7a5157257126684119
Merge branch 'master' into license-update-2020