]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2a8a5a6 372b660)
Merge remote-tracking branch 'upstream/3.5.1rc' into 1702-detect-server
authorMichael <heluecht@pirati.ca>
Thu, 2 Mar 2017 20:20:38 +0000 (20:20 +0000)
committerMichael <heluecht@pirati.ca>
Thu, 2 Mar 2017 20:20:38 +0000 (20:20 +0000)
1  2 
include/socgraph.php patch | diff1 | diff2 | blob | history

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