Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge

2017-06-20 18:39:27 -07:00
parent 7e4e2f28db 76e9809169
commit 99ff808b8a
16 changed files with 385 additions and 2539 deletions
--- 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;

 	}