From: Will Budic <redacted>
Date: Sat, 4 Jan 2020 07:56:46 +0000 (+1100)
Subject: Merge branch 'master' into 1.7.dev
X-Git-Url: https://lifelog.hopto.org/gitweb/?a=commitdiff_plain;h=231abac738d23778ee44935cbdbe440aec527f2b;p=LifeLog.git

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

231abac738d23778ee44935cbdbe440aec527f2b
diff --cc htdocs/cgi-bin/main.cgi
index 85df24f,468d103..5569f1d
--- a/htdocs/cgi-bin/main.cgi
+++ b/htdocs/cgi-bin/main.cgi
@@@ -1350,5 -1435,5 +1322,5 @@@ return qq
  					</p>
  </div>
  </td></tr></table>
- )}
- 
 -___STR
 -}
++)
++}