Merge branch 'pull'
This commit is contained in:
commit
1b8adf0f12
1 changed files with 0 additions and 1 deletions
|
@ -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)) {
|
||||
|
|
Loading…
Reference in a new issue