]> git.mxchange.org Git - friendica.git/commit
Merge branch 'develop' into rewrites/dbm_is_result
authorRoland Häder <roland@mxchange.org>
Thu, 22 Dec 2016 10:30:45 +0000 (11:30 +0100)
committerRoland Häder <roland@mxchange.org>
Thu, 22 Dec 2016 10:30:45 +0000 (11:30 +0100)
commitc99247ddabe7e8383aa86f94d4ffae73e382a710
tree029643362cff5336a469641677f562aa4b292367
parentdfc2c1f805b775cf69418051965890da32e16a23
parentc0df692f5fc4eaadb322614069b2c7ed40453fa1
Merge branch 'develop' into rewrites/dbm_is_result

Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
object/Item.php