]> git.mxchange.org Git - friendica.git/commit
Merge remote-tracking branch 'upstream/develop' into 1602-diaspora
authorMichael Vogel <icarus@dabo.de>
Sun, 13 Mar 2016 12:49:06 +0000 (13:49 +0100)
committerMichael Vogel <icarus@dabo.de>
Sun, 13 Mar 2016 12:49:06 +0000 (13:49 +0100)
commit7841837ec32efd04583c9d0631a626cfc6c0a46c
treedf2aab45a03ffbb061ac56d6498a59293bf813c5
parentf8f19038bf43aef56aae3898324a3658e2f04c14
parente884b0e579fc0cd3487863c618418743628dc1b1
Merge remote-tracking branch 'upstream/develop' into 1602-diaspora