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

Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas

Browse source 
Conflicts:
	CREDITS
	airtime_mvc/application/modules/rest/controllers/MediaController.php
	airtime_mvc/application/views/scripts/form/support-setting.phtml
This commit is contained in:
drigato 2015-01-23 16:36:31 -05:00
commit ac8fadfc80
36 changed files with 121 additions and 146 deletions
Download patch file Download diff file Expand all files Collapse all files

4
airtime_mvc/application/controllers/ApiController.php
View file

@ -14,7 +14,9 @@ class ApiController extends Zend_Controller_Action
"item-history-feed",
"shows",
"show-tracks",
"show-schedules"
"show-schedules",
"station-logo",
"show-logo"
);
$params = $this->getRequest()->getParams();