]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5de91c2 ca105f1)
Merge remote branch 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Mon, 4 Jun 2012 06:09:15 +0000 (08:09 +0200)
committerMichael Vogel <icarus@dabo.de>
Mon, 4 Jun 2012 06:09:15 +0000 (08:09 +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.