aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-08-14 04:27:34 -0700
committerFriendika <info@friendika.com>2011-08-14 04:27:34 -0700
commit1b8adf0f12824dad695847edc32c659e0dc6f887 (patch)
tree305a2c30658ab09c91d4a94d387dd3a54718271b
parentbbd545b9caa278d61ad423725dc591b3eb0e61f7 (diff)
parentf9d2c95c068b6f38514c5e74ed814f5ac52578db (diff)
downloadvolse-hubzilla-1b8adf0f12824dad695847edc32c659e0dc6f887.tar.gz
volse-hubzilla-1b8adf0f12824dad695847edc32c659e0dc6f887.tar.bz2
volse-hubzilla-1b8adf0f12824dad695847edc32c659e0dc6f887.zip
Merge branch 'pull'
-rw-r--r--addon/statusnet/statusnet.php1
1 files changed, 0 insertions, 1 deletions
diff --git a/addon/statusnet/statusnet.php b/addon/statusnet/statusnet.php
index 2ce4b7eab..2f02ded54 100644
--- a/addon/statusnet/statusnet.php
+++ b/addon/statusnet/statusnet.php
@@ -62,7 +62,6 @@ class StatusNetOAuth extends TwitterOAuth {
$this->http_info = array();
$ci = curl_init();
/* Curl settings */
- $prx = 'http://localhost:8118';
$prx = get_config('system','proxy');
logger('Proxy SN: '.$prx);
if(strlen($prx)) {