diff options
author | redmatrix <git@macgirvin.com> | 2016-03-12 16:47:11 -0800 |
---|---|---|
committer | redmatrix <git@macgirvin.com> | 2016-03-12 16:47:11 -0800 |
commit | 70ad69d38c53f78d04d912495f63c6fb781f0550 (patch) | |
tree | 19c7a8282113431e6a4e47a256925d2aef6fb66f /mod/display.php | |
parent | cb0c43bc6805721cd298796aa028d96398122e7a (diff) | |
parent | 7efffbf102d7954a973816c75054bed7fdefebf6 (diff) | |
download | volse-hubzilla-70ad69d38c53f78d04d912495f63c6fb781f0550.tar.gz volse-hubzilla-70ad69d38c53f78d04d912495f63c6fb781f0550.tar.bz2 volse-hubzilla-70ad69d38c53f78d04d912495f63c6fb781f0550.zip |
Merge https://github.com/redmatrix/hubzilla into pending_merge
Diffstat (limited to 'mod/display.php')
-rw-r--r-- | mod/display.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mod/display.php b/mod/display.php index ac1de17ca..40427846b 100644 --- a/mod/display.php +++ b/mod/display.php @@ -329,6 +329,5 @@ function display_content(&$a, $update = 0, $load = false) { } */ - return $o; } |