]> git.mxchange.org Git - friendica.git/commitdiff
Merge remote-tracking branch 'upstream/3.5.2rc' into bugfix-mail
authorMichael <heluecht@pirati.ca>
Wed, 17 May 2017 19:56:38 +0000 (19:56 +0000)
committerMichael <heluecht@pirati.ca>
Wed, 17 May 2017 19:56:38 +0000 (19:56 +0000)

Trivial merge