aboutsummaryrefslogtreecommitdiffstats
path: root/include/import.php
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2018-01-18 13:20:23 +0100
committerMario Vavti <mario@mariovavti.com>2018-01-18 13:20:23 +0100
commita0e1a8e0a20df640ef951dee4fb3c6ed19faee03 (patch)
tree672bdd787b969c495d2a279da14c0781adb89a29 /include/import.php
parenta486c906863a59c0ebed80192b2c0e9aeb111f12 (diff)
parenteb86ffefbfb38cf76316940a6aa164530f9b9348 (diff)
downloadvolse-hubzilla-a0e1a8e0a20df640ef951dee4fb3c6ed19faee03.tar.gz
volse-hubzilla-a0e1a8e0a20df640ef951dee4fb3c6ed19faee03.tar.bz2
volse-hubzilla-a0e1a8e0a20df640ef951dee4fb3c6ed19faee03.zip
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'include/import.php')
-rw-r--r--include/import.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/import.php b/include/import.php
index 51791347a..9920df8be 100644
--- a/include/import.php
+++ b/include/import.php
@@ -82,7 +82,8 @@ function import_channel($channel, $account_id, $seize) {
'channel_r_storage', 'channel_r_pages', 'channel_w_stream', 'channel_w_wall',
'channel_w_comment', 'channel_w_mail', 'channel_w_like', 'channel_w_tagwall',
'channel_w_chat', 'channel_w_storage', 'channel_w_pages', 'channel_a_republish',
- 'channel_a_delegate', 'perm_limits', 'channel_password', 'channel_salt'
+ 'channel_a_delegate', 'perm_limits', 'channel_password', 'channel_salt',
+ 'channel_moved'
];
$clean = array();