Merge branch 'master' of https://github.com/redmatrix/redmatrix

2015-06-02 17:47:47 -07:00
parent f3b95f591a 86ff31f500
commit 7cbc504874
10 changed files with 380 additions and 371 deletions
--- a/mod/network.php
+++ b/mod/network.php
@@ -505,7 +505,6 @@ function network_content(&$a, $update = 0, $load = false) {

 	$mode = (($nouveau) ? 'network-new' : 'network');

-
 	$o .= conversation($a,$items,$mode,$update,$page_mode);

 	if(($items) && (! $update))