From: Will Budicm <redacted>
Date: Sun, 27 Dec 2020 19:42:29 +0000 (+1100)
Subject: Merge branch '2.2.dev' into master, which is 2.1.
X-Git-Url: https://lifelog.hopto.org/gitweb/?a=commitdiff_plain;h=3f553e45ee09ef95f195730364fa0fc1914c4a90;p=LifeLog.git

Merge branch '2.2.dev' into master, which is 2.1.
---

3f553e45ee09ef95f195730364fa0fc1914c4a90