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

Merge branch '2.5.x-installer' into saas-installer-albert

Browse source 
Conflicts:
	python_apps/pypo/pypo/pypofile.py
This commit is contained in:
Albert Santoni 2015-05-22 18:26:16 -04:00
commit 6ca0e340a4
13 changed files with 42 additions and 132 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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