]> git.mxchange.org Git - friendica.git/commit
Merge remote-tracking branch 'upstream/master' into contact-discovery
authorMichael <heluecht@pirati.ca>
Mon, 24 Jun 2019 03:23:57 +0000 (03:23 +0000)
committerMichael <heluecht@pirati.ca>
Mon, 24 Jun 2019 03:23:57 +0000 (03:23 +0000)
commit037cf01a1505f0f2e163c2ed1832ce5cd5f0fe71
tree050a1afbc83aba6b9b96a388337f0ac4b7e7affa
parent857469d16ab5f244cdacc3dee2da029b55e27c9b
parentf0c85432416de5253bf24aae43c3551a96d09357
Merge remote-tracking branch 'upstream/master' into contact-discovery