]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a3f08c4 53157bb)
Merge remote branch 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Wed, 9 May 2012 12:56:48 +0000 (14:56 +0200)
committerMichael Vogel <icarus@dabo.de>
Wed, 9 May 2012 12:56:48 +0000 (14:56 +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.