]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b1e766d f47d582)
Merge remote-tracking branch 'friendika/master'
authorFabio Comuni <fabrix.xm@gmail.com>
Fri, 29 Jul 2011 15:23:09 +0000 (17:23 +0200)
committerFabio Comuni <fabrix.xm@gmail.com>
Fri, 29 Jul 2011 15:23:09 +0000 (17:23 +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.