projects / friendica-addons.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8ec3503 ee582bf)
Merge remote branch 'upstream/master'
authorMichael <icarus@dabo.de>
Wed, 11 Apr 2012 16:49:11 +0000 (18:49 +0200)
committerMichael <icarus@dabo.de>
Wed, 11 Apr 2012 16:49:11 +0000 (18:49 +0200)
1  2 
facebook/facebook.php patch | diff1 | diff2 | blob | history

diff --cc facebook/facebook.php
Simple merge
Unnamed repository; edit this file 'description' to name the repository.