]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ed00b63 fc06980)
Merge remote-tracking branch 'upstream/develop' into more-abstraction
authorMichael <heluecht@pirati.ca>
Tue, 19 Jun 2018 13:48:19 +0000 (13:48 +0000)
committerMichael <heluecht@pirati.ca>
Tue, 19 Jun 2018 13:48:19 +0000 (13:48 +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.