Merge remote-tracking branch 'origin/development' into development

2019-12-07 13:52:39 +01:00 · 2019-12-07 13:52:39 +01:00 · 2b60af2605
commit 2b60af2605
parent 0298a1dcbe cc34d89283
1 changed files with 1 additions and 0 deletions
--- a/server/lib/message-sender.js
+++ b/server/lib/message-sender.js
@ -585,6 +585,7 @@ async function sendQueuedMessage(queuedMessage) {
            subscriptionId: msgData.subscriptionId,
            listId: msgData.listId,
            to: msgData.to,
+            mergeTags: msgData.mergeTags,
            encryptionKeys: msgData.encryptionKeys
        });
    } catch (err) {