]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8c251ae a4b407e)
Merge branch 'master' of https://github.com/friendica/friendica
authorSebastian Egbers <sebastian@egbers.info>
Tue, 26 Jun 2012 06:33:41 +0000 (08:33 +0200)
committerSebastian Egbers <sebastian@egbers.info>
Tue, 26 Jun 2012 06:33:41 +0000 (08:33 +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.