]> git.mxchange.org Git - friendica.git/commit
Merge remote-tracking branch 'upstream/develop' into 1602-diaspora
authorMichael Vogel <icarus@dabo.de>
Thu, 10 Mar 2016 07:22:52 +0000 (08:22 +0100)
committerMichael Vogel <icarus@dabo.de>
Thu, 10 Mar 2016 07:22:52 +0000 (08:22 +0100)
commitcd0fbc5e9a262dfb46e8278da840a87c47eb3ff0
tree2164c4c7cdfc2c2ee3e45f6c845b5afc85903df4
parent32c66246c4fcddcab30e4850d5c6b62bdfac225a
parenta28d44a9ba2934281b411317773352c15df72632
Merge remote-tracking branch 'upstream/develop' into 1602-diaspora