]> git.mxchange.org Git - friendica.git/commit
Merge remote-tracking branch 'upstream/develop' into 1612-diaspora
authorMichael <heluecht@pirati.ca>
Thu, 29 Dec 2016 10:16:10 +0000 (10:16 +0000)
committerMichael <heluecht@pirati.ca>
Thu, 29 Dec 2016 10:16:10 +0000 (10:16 +0000)
commit1490f2d3b724348909ff879db4773871dec1cd7f
treed50f8bb8e5ff0b034380425f721c9b3aa028ceae
parent483f34c4ce7cf9a9b0404488d8a5c46a6532f29b
parent1d0cb0f7d21504f00afe197aea482839ddd56cf6
Merge remote-tracking branch 'upstream/develop' into 1612-diaspora