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

2017-04-26 20:11:12 -07:00
parent 6fcfab3488 1c304eb8ba
commit 88149f56bb
12 changed files with 46 additions and 17 deletions
--- a/include/text.php
+++ b/include/text.php
@@ -3175,4 +3175,4 @@ function ellipsify($s,$maxlen) {
 		return $s;

 	return mb_substr($s,0,$maxlen / 2) . '...' . mb_substr($s,mb_strlen($s) - ($maxlen / 2));
-} 
+}