]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ba99ac7 ff886bb)
Merge remote-tracking branch 'upstream/develop' into 1601-api-statuses-lookup
authorMichael Vogel <icarus@dabo.de>
Tue, 5 Apr 2016 21:35:33 +0000 (23:35 +0200)
committerMichael Vogel <icarus@dabo.de>
Tue, 5 Apr 2016 21:35:33 +0000 (23:35 +0200)
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.