]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 83935d6 adefb06)
Merge remote-tracking branch 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Sat, 14 Jun 2014 23:49:03 +0000 (01:49 +0200)
committerMichael Vogel <icarus@dabo.de>
Sat, 14 Jun 2014 23:49:03 +0000 (01:49 +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.