]> git.mxchange.org Git - friendica.git/commitdiff
Merge remote-tracking branch 'upstream/develop' into develop
authorRalf Thees <ralf@herrthees.de>
Thu, 23 Aug 2018 14:58:18 +0000 (16:58 +0200)
committerRalf Thees <ralf@herrthees.de>
Thu, 23 Aug 2018 14:58:18 +0000 (16:58 +0200)

Trivial merge