]> git.mxchange.org Git - friendica.git/commitdiff
Merge remote-tracking branch 'upstream/develop' into 1702-no_old_share
authorMichael <heluecht@pirati.ca>
Sun, 12 Mar 2017 20:52:48 +0000 (20:52 +0000)
committerMichael <heluecht@pirati.ca>
Sun, 12 Mar 2017 20:52:48 +0000 (20:52 +0000)

Trivial merge