]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3c835cc de56a3a)
Merge remote-tracking branch 'upstream/develop' into issue-4069
authorMichael <heluecht@pirati.ca>
Sun, 17 Dec 2017 12:10:32 +0000 (12:10 +0000)
committerMichael <heluecht@pirati.ca>
Sun, 17 Dec 2017 12:10:32 +0000 (12:10 +0000)
1  2 
include/api.php patch | diff1 | diff2 | blob | history

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