]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e3c36df cd25c3b)
Merge remote-tracking branch 'sebastian/master'
authorMax Weller <git@max-weller.de>
Sat, 23 Jun 2012 20:59:03 +0000 (22:59 +0200)
committerMax Weller <git@max-weller.de>
Sat, 23 Jun 2012 20:59:03 +0000 (22:59 +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.