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

Conflicts: mod/editpost.php util/messages.po view/nl/messages.po view/nl/strings.php
2015-07-10 14:27:41 -07:00
parent 43354ab385 4bf7e4a34d
commit a497d8ee66
22 changed files with 167 additions and 138 deletions
--- a/include/text.php
+++ b/include/text.php
@@ -807,7 +807,7 @@ function contact_block() {
 	$shown = get_pconfig($a->profile['uid'],'system','display_friend_count');

 	if($shown === false)
-		$shown = 24;
+		$shown = 25;
 	if($shown == 0)
 		return;