]> git.mxchange.org Git - friendica.git/commit
Merge remote-tracking branch 'upstream/develop' into 1602-diaspora
authorMichael Vogel <icarus@dabo.de>
Sun, 6 Mar 2016 20:20:00 +0000 (21:20 +0100)
committerMichael Vogel <icarus@dabo.de>
Sun, 6 Mar 2016 20:20:00 +0000 (21:20 +0100)
commit918efbafac4ed970275b129384ef1e0262297fd9
treedb911212f04c00cc84775f7cffccd71e9dd31947
parentaf7b028b13b411bb241dacf488b1085dbaf26780
parentfa652ad1bcc06e916e96c25970291ddbeae8eda0
Merge remote-tracking branch 'upstream/develop' into 1602-diaspora
include/diaspora.php