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/include/channel.php
+++ b/include/channel.php
@@ -2373,5 +2373,6 @@ function anon_identity_init($reqvars) {
 	}

 	return $x[0];
+}
+

-}
--- a/include/feedutils.php
+++ b/include/feedutils.php
@@ -1744,3 +1744,4 @@ function asencode_person($p) {

 	return $ret;
 }
+