Merge branch 'dev' into 'dev'

Zot -> Zot6 translation issue, liking a "new friend" activity See merge request hubzilla/core!1723
2019-09-10 10:40:53 +02:00
parent dcfe10b691 d9052c7e3c
commit f2b121cd58
2 changed files with 17 additions and 8 deletions
--- a/include/zot.php
+++ b/include/zot.php
@@ -2392,7 +2392,6 @@ function process_mail_delivery($sender, $arr, $deliveries) {
 			}
 		}

-
 		$r = q("select id, conv_guid from mail where mid = '%s' and channel_id = %d limit 1",
 			dbesc($arr['mid']),
 			intval($channel['channel_id'])