]> git.mxchange.org Git - friendica.git/commit
Merge remote-tracking branch 'upstream/develop' into 1602-diaspora
authorMichael Vogel <icarus@dabo.de>
Tue, 1 Mar 2016 09:45:16 +0000 (10:45 +0100)
committerMichael Vogel <icarus@dabo.de>
Tue, 1 Mar 2016 09:45:16 +0000 (10:45 +0100)
commitb48880fe52aaf51cb843d855114990be001a5279
tree248a38d3c72fadcdd3eecab0542c3562578523c3
parentcb900c5742628ad437b7fc2d06d10e9999a06aaf
parent066ddada178c743bfcc0f7a68890145fbca7d2e6
Merge remote-tracking branch 'upstream/develop' into 1602-diaspora