]> git.mxchange.org Git - friendica.git/commit
Merge remote-tracking branch 'upstream/develop' into 1602-diaspora
authorMichael Vogel <icarus@dabo.de>
Sat, 12 Mar 2016 10:06:43 +0000 (11:06 +0100)
committerMichael Vogel <icarus@dabo.de>
Sat, 12 Mar 2016 10:06:43 +0000 (11:06 +0100)
commit57fb0a9129326a806cde79f6f3fb5a42d1ef4982
treeeba9700e32f32311a2ba17c4f3057f177c1e1502
parenta0aeea4a89e26f21125f52b4a8657ca93f2a1f80
parentcabb84a42a72497e4fca250ea199f8c2b27434a2
Merge remote-tracking branch 'upstream/develop' into 1602-diaspora