diff options
| author | Max Kostikov <max@kostikov.co> | 2019-09-10 10:40:53 +0200 |
|---|---|---|
| committer | Max Kostikov <max@kostikov.co> | 2019-09-10 10:40:53 +0200 |
| commit | f2b121cd58fd4884c09b3d0474f5ac4443d4b0e9 (patch) | |
| tree | 9e005d0749246af8b30a30913194b2e20bc813f8 /include | |
| parent | dcfe10b69118eab9795d234b68c6a310da97d383 (diff) | |
| parent | d9052c7e3cba157c1465125bcc5e1e0c9b98f8aa (diff) | |
| download | volse-hubzilla-f2b121cd58fd4884c09b3d0474f5ac4443d4b0e9.tar.gz volse-hubzilla-f2b121cd58fd4884c09b3d0474f5ac4443d4b0e9.tar.bz2 volse-hubzilla-f2b121cd58fd4884c09b3d0474f5ac4443d4b0e9.zip | |
Merge branch 'dev' into 'dev'
Zot -> Zot6 translation issue, liking a "new friend" activity
See merge request hubzilla/core!1723
Diffstat (limited to 'include')
| -rw-r--r-- | include/zot.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/zot.php b/include/zot.php index 60bada1d6..bd85dd755 100644 --- 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']) |