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

Merge branch 'cc-5709-airtime-analyzer' into saas-fix-modules-bootstrap-14-04

Browse source 
Conflicts:
	airtime_mvc/application/configs/application.ini
	airtime_mvc/application/controllers/plugins/Acl_plugin.php
	airtime_mvc/application/models/Cache.php
This commit is contained in:
drigato 2014-08-28 17:01:03 -04:00
commit ace883c975
5 changed files with 35 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
airtime_mvc/application/modules/rest/Bootstrap.php
View file

@ -1,4 +1,4 @@
<?
<?php
class Rest_Bootstrap extends Zend_Application_Module_Bootstrap
{