Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
This commit is contained in:
commit
4d6c3fdbf4
178 changed files with 69380 additions and 70 deletions
|
@ -20,7 +20,7 @@ set_include_path(__DIR__.'/../../../airtime_mvc/application/models' . PATH_SEPAR
|
|||
set_include_path(__DIR__.'/../../../airtime_mvc/application/configs' . PATH_SEPARATOR . get_include_path());
|
||||
require_once 'conf.php';
|
||||
require_once 'propel/runtime/lib/Propel.php';
|
||||
Propel::init(__DIR__."/../../../airtime_mvc/application/configs/airtime-conf.php");
|
||||
Propel::init(__DIR__."/propel/airtime-conf.php");
|
||||
|
||||
require_once 'UpgradeCommon.php';
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue