Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

2
application/forms/AddShowWhat.php
View file

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

2
python_apps/pypo/scripts/ls_config.liq
View file

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