Merge branch 'pull'

This commit is contained in:
Friendika 2011-08-14 04:27:34 -07:00
commit 1b8adf0f12
1 changed files with 0 additions and 1 deletions

View File

@ -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)) {