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

Merge branch '1.9.1' into devel

Browse source 
Conflicts:
	VERSION
	airtime_mvc/application/configs/constants.php
	airtime_mvc/application/configs/navigation.php
	install_minimal/DoctrineMigrations/Version20110711161043.php
	python_apps/api_clients/api_client.py
This commit is contained in:
James 2011-08-18 19:05:13 -04:00
commit f855da0f45
10 changed files with 150 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

6
airtime_mvc/application/configs/navigation.php
View file

@ -64,6 +64,12 @@ $pages = array(
'module' => 'default',
'controller' => 'Preference',
'action' => 'stream-setting'
),
array(
'label' => 'Support Settings',
'module' => 'default',
'controller' => 'Preference',
'action' => 'support-setting'
)
)
),