From: friendica <info@friendica.com>
Date: Sat, 21 Jan 2012 23:20:03 +0000 (-0800)
Subject: Merge branch 'apull'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d7bd2246c18f5880fc3c083bf3d698fe4f29fcb6;p=friendica-addons.git

Merge branch 'apull'
---

d7bd2246c18f5880fc3c083bf3d698fe4f29fcb6
diff --cc statusnet/statusnet.php
index 6580e897,7e9226a0..7e9226a0
mode 100755,100644..100755
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
diff --cc twitter/twitter.php
index c492c6c7,a6f73c86..a6f73c86
mode 100755,100644..100755
--- a/twitter/twitter.php
+++ b/twitter/twitter.php