]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dfc2c1f c0df692)
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)
Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
object/Item.php


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.