aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module/Channel.php
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-03-25 14:40:31 -0700
committerzotlabs <mike@macgirvin.com>2017-03-25 14:40:31 -0700
commite5e0a6b31f7870a46766c1e8ff87886fdb14b6de (patch)
tree7035d84f2edbc6b6efa435527ffdc3cd38b8027a /Zotlabs/Module/Channel.php
parent5c63f7dd58c5b3b88efcc47120c791f92527f720 (diff)
parent2115eb26a7fd2ca937286bd4e98ab74c7d6e9525 (diff)
downloadvolse-hubzilla-e5e0a6b31f7870a46766c1e8ff87886fdb14b6de.tar.gz
volse-hubzilla-e5e0a6b31f7870a46766c1e8ff87886fdb14b6de.tar.bz2
volse-hubzilla-e5e0a6b31f7870a46766c1e8ff87886fdb14b6de.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'Zotlabs/Module/Channel.php')
-rw-r--r--Zotlabs/Module/Channel.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/Zotlabs/Module/Channel.php b/Zotlabs/Module/Channel.php
index 1bfecf2f6..61df35a60 100644
--- a/Zotlabs/Module/Channel.php
+++ b/Zotlabs/Module/Channel.php
@@ -121,7 +121,7 @@ class Channel extends \Zotlabs\Web\Controller {
$static = channel_manual_conv_update(\App::$profile['profile_uid']);
- $o .= profile_tabs($a, $is_owner, \App::$profile['channel_address']);
+ //$o .= profile_tabs($a, $is_owner, \App::$profile['channel_address']);
$o .= common_friends_visitor_widget(\App::$profile['profile_uid']);