]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6afa5d1 1d91b2d)
Merge remote-tracking branch 'upstream/master'
authorroot <root@pirati.ca>
Sun, 4 Nov 2012 22:31:05 +0000 (23:31 +0100)
committerroot <root@pirati.ca>
Sun, 4 Nov 2012 22:31:05 +0000 (23:31 +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.