]> git.mxchange.org Git - friendica.git/commitdiff
Merge remote-tracking branch 'upstream/develop' into fix-it
authorMichael <heluecht@pirati.ca>
Fri, 29 Jun 2018 11:03:30 +0000 (11:03 +0000)
committerMichael <heluecht@pirati.ca>
Fri, 29 Jun 2018 11:03:30 +0000 (11:03 +0000)

Trivial merge