]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cbc3214 0d32fce)
Merge remote-tracking branch 'upstream/develop' into develop
authorRoland Häder <roland@mxchange.org>
Fri, 6 Jan 2017 16:10:40 +0000 (17:10 +0100)
committerRoland Häder <roland@mxchange.org>
Fri, 6 Jan 2017 16:10:40 +0000 (17:10 +0100)
1  2 
include/dfrn.php patch | diff1 | diff2 | blob | history

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