aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-06-20 18:39:27 -0700
committerzotlabs <mike@macgirvin.com>2017-06-20 18:39:27 -0700
commit99ff808b8a7d3e7d4a4e6f04f13dcb18652532a2 (patch)
tree75408410d5e4eb71101924df37b16b8eec864181 /Zotlabs/Module
parent7e4e2f28dbc52316f4cef7c17a7c9e6ec7f607dc (diff)
parent76e98091690cf5f2726bf7cefea217d49b23a5b4 (diff)
downloadvolse-hubzilla-99ff808b8a7d3e7d4a4e6f04f13dcb18652532a2.tar.gz
volse-hubzilla-99ff808b8a7d3e7d4a4e6f04f13dcb18652532a2.tar.bz2
volse-hubzilla-99ff808b8a7d3e7d4a4e6f04f13dcb18652532a2.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'Zotlabs/Module')
-rw-r--r--Zotlabs/Module/Moderate.php1
1 files changed, 0 insertions, 1 deletions
diff --git a/Zotlabs/Module/Moderate.php b/Zotlabs/Module/Moderate.php
index 47c373d28..9af43420d 100644
--- a/Zotlabs/Module/Moderate.php
+++ b/Zotlabs/Module/Moderate.php
@@ -69,7 +69,6 @@ class Moderate extends \Zotlabs\Web\Controller {
}
$o = conversation($items,'moderate',false,'traditional');
-
return $o;
}