From: wbudic <redacted>
Date: Thu, 7 Mar 2019 22:42:56 +0000 (+1100)
Subject: Merge branch 'master' into dev.1.3
X-Git-Url: https://lifelog.hopto.org/gitweb/?a=commitdiff_plain;h=e8f2f7784fcde44d0f2f2fd0ce7fde7f2c94a813;p=LifeLog.git

Merge branch 'master' into dev.1.3
---

e8f2f7784fcde44d0f2f2fd0ce7fde7f2c94a813