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

Merge branch 'develop' into rewrites/dbm_is_result

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

Conflicts:
	object/Item.php
---

c99247ddabe7e8383aa86f94d4ffae73e382a710