Merge branch 'master' of dev.sourcefabric.org:campcaster

This commit is contained in:
naomiaro 2011-03-25 17:19:38 -04:00
commit bb0f610fca
2 changed files with 2 additions and 2 deletions

View File

@ -16,7 +16,7 @@ class Application_Form_AddShowWhat extends Zend_Form_SubForm
// Add URL element
$this->addElement('text', 'add_show_url', array(
'label' => 'Show URL:',
'label' => 'Website:',
'class' => 'input_text',
'required' => false,
'filters' => array('StringTrim'),

View File

@ -44,5 +44,5 @@ icecast_description = "Airtime Radio!"
icecast_genre = "genre"
output_sound_device = false
output_icecast_vorbis = true
output_icecast_vorbis = false
output_icecast_mp3 = true