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

Merge branch 'devel' into 2.3.x-saas

Browse source
This commit is contained in:
Martin Konecny 2013-01-15 15:38:27 -05:00
commit e98d6e92bb
21 changed files with 179 additions and 171 deletions
Download patch file Download diff file Expand all files Collapse all files

1
airtime_mvc/application/Bootstrap.php
View file

@ -1,6 +1,5 @@
<?php
require_once __DIR__."/configs/conf.php";
Config::loadConfig();
$CC_CONFIG = Config::getConfig();
require_once __DIR__."/configs/ACL.php";