From: rabuzarus <>
Date: Fri, 21 Apr 2017 14:09:48 +0000 (+0200)
Subject: Merge develop into 20170407_-_group_edit
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f99bb958f61f17e81452f3f9c4d3472c3de8b37b;p=friendica.git

Merge develop into 20170407_-_group_edit

Conflicts:
	mod/group.php
---

f99bb958f61f17e81452f3f9c4d3472c3de8b37b