]> git.mxchange.org Git - friendica.git/commit
Merge remote-tracking branch 'upstream/develop' into 1602-diaspora
authorMichael Vogel <icarus@dabo.de>
Mon, 21 Mar 2016 05:47:47 +0000 (06:47 +0100)
committerMichael Vogel <icarus@dabo.de>
Mon, 21 Mar 2016 05:47:47 +0000 (06:47 +0100)
commit206c26ae30e711aa30cdb29d668bee9dce834c28
treede81c3d20afa7e8294199777f3243ce906ea9dbe
parent5a04ba84164070855c26737640f41ed3cb6dcf11
parent0bcd6886f0405562f76dfcfad14de85fed3cdcc3
Merge remote-tracking branch 'upstream/develop' into 1602-diaspora
include/like.php
mod/dfrn_confirm.php