aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Lib/Libsync.php
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2021-07-09 11:31:26 +0200
committerMario Vavti <mario@mariovavti.com>2021-07-09 11:31:26 +0200
commit2dd47a9f596106bfe8ea5d95a5f20597ed8bf0cd (patch)
tree8fd238ebca4b124916eb31a6760bb227b7bb57ba /Zotlabs/Lib/Libsync.php
parent6de327402bb90b3f09ccb0c92ffb112755dbd5a0 (diff)
parenta92ad512bbcfc367f17739886cdeada13c20e66a (diff)
downloadvolse-hubzilla-2dd47a9f596106bfe8ea5d95a5f20597ed8bf0cd.tar.gz
volse-hubzilla-2dd47a9f596106bfe8ea5d95a5f20597ed8bf0cd.tar.bz2
volse-hubzilla-2dd47a9f596106bfe8ea5d95a5f20597ed8bf0cd.zip
Merge branch '6.0RC'
Diffstat (limited to 'Zotlabs/Lib/Libsync.php')
-rw-r--r--Zotlabs/Lib/Libsync.php3
1 files changed, 0 insertions, 3 deletions
diff --git a/Zotlabs/Lib/Libsync.php b/Zotlabs/Lib/Libsync.php
index 5455aa2ea..67603a0e3 100644
--- a/Zotlabs/Lib/Libsync.php
+++ b/Zotlabs/Lib/Libsync.php
@@ -255,9 +255,6 @@ class Libsync {
if (array_key_exists('chatroom', $arr) && $arr['chatroom'])
sync_chatrooms($channel, $arr['chatroom']);
- if (array_key_exists('conv', $arr) && $arr['conv'])
- import_conv($channel, $arr['conv']);
-
if (array_key_exists('mail', $arr) && $arr['mail'])
sync_mail($channel, $arr['mail']);