]> git.mxchange.org Git - friendica.git/commitdiff
Merge remote-tracking branch 'upstream/develop' into rewrites/dbm_is_result
authorRoland Häder <roland@mxchange.org>
Tue, 20 Dec 2016 14:50:46 +0000 (15:50 +0100)
committerRoland Häder <roland@mxchange.org>
Tue, 20 Dec 2016 14:50:46 +0000 (15:50 +0100)

Trivial merge