]> git.mxchange.org Git - friendica.git/commitdiff
Merge remote-tracking branch 'upstream/3.5.1rc' into 1702-detect-server
authorMichael <heluecht@pirati.ca>
Sat, 4 Mar 2017 08:38:04 +0000 (08:38 +0000)
committerMichael <heluecht@pirati.ca>
Sat, 4 Mar 2017 08:38:04 +0000 (08:38 +0000)

Trivial merge