From: Ben Sturmfels <ben@sturm.com.au>
Date: Tue, 5 May 2020 10:57:18 +0000 (+1000)
Subject: Merge branch 'master' into stable
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=812a03d8ba0864febff90fe9feec2ea08e3dd4f0;p=mediagoblin.git

Merge branch 'master' into stable
---

812a03d8ba0864febff90fe9feec2ea08e3dd4f0