]> lifelog.hopto.org Git - LifeLog.git/commitdiff
Merge branch '2.2.dev' into master, which is 2.1.
authorWill Budicm <redacted>
Sun, 27 Dec 2020 19:42:29 +0000 (06:42 +1100)
committerWill Budicm <redacted>
Sun, 27 Dec 2020 19:42:29 +0000 (06:42 +1100)

Trivial merge