]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5a04ba8 0bcd688)
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)
1  2 
include/like.php patch | diff1 | diff2 | blob | history
mod/dfrn_confirm.php patch | diff1 | diff2 | blob | history

diff --cc include/like.php
Simple merge
diff --cc mod/dfrn_confirm.php
Simple merge
Unnamed repository; edit this file 'description' to name the repository.