]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2c89a43 e16360f)
Merge branch 'develop' of https://github.com/gerhard6380/friendica into develop
authorroot <root@bk-hasecom.hasecom.local>
Tue, 24 Nov 2015 01:56:35 +0000 (02:56 +0100)
committerroot <root@bk-hasecom.hasecom.local>
Tue, 24 Nov 2015 01:56:35 +0000 (02:56 +0100)
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.