]> git.mxchange.org Git - friendica.git/commitdiff
Merge remote-tracking branch 'upstream/3.5.1rc' into 1702-detect-server
authorMichael <heluecht@pirati.ca>
Sun, 5 Mar 2017 16:23:58 +0000 (16:23 +0000)
committerMichael <heluecht@pirati.ca>
Sun, 5 Mar 2017 16:23:58 +0000 (16:23 +0000)

Trivial merge