]> 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 06:38:25 +0000 (07:38 +0100)
committerMichael Vogel <icarus@dabo.de>
Sat, 12 Mar 2016 06:38:25 +0000 (07:38 +0100)
commita0aeea4a89e26f21125f52b4a8657ca93f2a1f80
tree4d533df341d19fa123c90b60d9306a7d189544bb
parentcd0fbc5e9a262dfb46e8278da840a87c47eb3ff0
parentee2020caffbe8d0737c4db003bba9cb21be12600
Merge remote-tracking branch 'upstream/develop' into 1602-diaspora