aboutsummaryrefslogtreecommitdiffstats
path: root/mod/network.php
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-06-02 17:47:47 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-06-02 17:47:47 -0700
commit7cbc5048743bc5976e48cd3f81801550c0b7f52f (patch)
treef9effa684ef44298d1922bd715d7b1ca9823374d /mod/network.php
parentf3b95f591a7ec49b6fc148913861bae2bb6aa6c7 (diff)
parent86ff31f5003312a6c1bcb65c7aa25ad001f542d4 (diff)
downloadvolse-hubzilla-7cbc5048743bc5976e48cd3f81801550c0b7f52f.tar.gz
volse-hubzilla-7cbc5048743bc5976e48cd3f81801550c0b7f52f.tar.bz2
volse-hubzilla-7cbc5048743bc5976e48cd3f81801550c0b7f52f.zip
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Diffstat (limited to 'mod/network.php')
-rw-r--r--mod/network.php1
1 files changed, 0 insertions, 1 deletions
diff --git a/mod/network.php b/mod/network.php
index 9ebdf7198..6431883d5 100644
--- 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))