]> git.mxchange.org Git - friendica.git/commit
Merge remote-tracking branch 'upstream/develop' into 1602-diaspora
authorMichael Vogel <icarus@dabo.de>
Wed, 2 Mar 2016 10:59:13 +0000 (11:59 +0100)
committerMichael Vogel <icarus@dabo.de>
Wed, 2 Mar 2016 10:59:13 +0000 (11:59 +0100)
commit1f7f964bb7200d4f658742a999c07f1dd6cbe97c
treed2fd5376edf7de9e93450b2e89b37928176b4e6c
parentf1dae26df8a9f46d683716b48b9b739f02824302
parent73f4c3c8da007cec58494cb1b09b31fe0b77b794
Merge remote-tracking branch 'upstream/develop' into 1602-diaspora