Merge branch 'airtime-2.0.x' into devel

This commit is contained in:
James 2012-01-17 14:48:04 -05:00
commit 087d893a60
8 changed files with 38 additions and 19 deletions

View file

@ -81,5 +81,9 @@ class Config {
$CC_CONFIG['soundcloud-connection-retries'] = $values['soundcloud']['connection_retries'];
$CC_CONFIG['soundcloud-connection-wait'] = $values['soundcloud']['time_between_retries'];
if(isset($values['demo']['demo'])){
$CC_CONFIG['demo'] = $values['demo']['demo'];
}
}
}