projects / friendica-addons.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 86b1b16 640c21f)
Merge remote branch 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Sun, 17 Jun 2012 07:13:25 +0000 (09:13 +0200)
committerMichael Vogel <icarus@dabo.de>
Sun, 17 Jun 2012 07:13:25 +0000 (09:13 +0200)
1  2 
facebook/facebook.php patch | diff1 | diff2 | blob | history
tumblr/tumblr.php patch | diff1 | diff2 | blob | history

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