]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 61da466 a0a26a8)
Merge pull request #2969 from gerhard6380/develop
authorMichael Vogel <icarus@dabo.de>
Wed, 23 Nov 2016 04:13:31 +0000 (05:13 +0100)
committerGitHub <noreply@github.com>
Wed, 23 Nov 2016 04:13:31 +0000 (05:13 +0100)
Develop

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.