]> git.mxchange.org Git - friendica.git/commit
Merge remote-tracking branch 'upstream/develop' into 1602-diaspora
authorMichael Vogel <icarus@dabo.de>
Thu, 24 Mar 2016 15:19:52 +0000 (16:19 +0100)
committerMichael Vogel <icarus@dabo.de>
Thu, 24 Mar 2016 15:19:52 +0000 (16:19 +0100)
commitec90a9e6ad1b2d424f7c72410d4a5a6cec2aad9b
tree87d76dcc18528d6481273eaa4e5b4ca5cb57c9c4
parent7bf079d858db1604b9c2a34a414756c1b70066de
parentdcb8d51a4c28154771b301aacb9e34d3cc7fcf08
Merge remote-tracking branch 'upstream/develop' into 1602-diaspora