]> git.mxchange.org Git - friendica.git/commitdiff
Merge remote-tracking branch 'upstream/develop' into 1702-detect-server
authorMichael <heluecht@pirati.ca>
Thu, 16 Mar 2017 05:51:22 +0000 (05:51 +0000)
committerMichael <heluecht@pirati.ca>
Thu, 16 Mar 2017 05:51:22 +0000 (05:51 +0000)

Trivial merge