From: Roland Häder <roland@mxchange.org>
Date: Tue, 20 Dec 2016 10:06:07 +0000 (+0100)
Subject: Merge branch 'develop' into rewrites/dbm_is_result
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=35973b9273df73b92b840634ff021deb501e4221;p=friendica.git

Merge branch 'develop' into rewrites/dbm_is_result

Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	mod/events.php
	mod/fbrowser.php
	mod/group.php
	view/theme/quattro/theme.php
---

35973b9273df73b92b840634ff021deb501e4221