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

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