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

Merge branch '2.5.x' into saas-pullreq77

Browse source 
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/controllers/ApiController.php
This commit is contained in:
Albert Santoni 2015-01-09 13:10:54 -05:00
commit f0bad70cee
11 changed files with 361 additions and 189 deletions
Download patch file Download diff file Expand all files Collapse all files

1
airtime_mvc/application/Bootstrap.php
View file

@ -12,6 +12,7 @@ require_once 'Preference.php';
require_once 'Locale.php';
require_once "DateHelper.php";
require_once "LocaleHelper.php";
require_once "HTTPHelper.php";
require_once "OsPath.php";
require_once "Database.php";
require_once "Timezone.php";