From: Will Budicm <redacted>
Date: Thu, 24 Dec 2020 06:05:59 +0000 (+1100)
Subject: Merge branch 'master' into 2.2.dev
X-Git-Url: https://lifelog.hopto.org/gitweb/?a=commitdiff_plain;h=cde764626199f10b29baaa04e4e592444ea69081;p=LifeLog.git

Merge branch 'master' into 2.2.dev
Post release updates. Before development starts on this branch.
---

cde764626199f10b29baaa04e4e592444ea69081