Merge branch '2.5.x' into saas

This commit is contained in:
Albert Santoni 2014-06-25 11:25:50 -04:00
commit 4157c21b28
2 changed files with 4 additions and 2 deletions

View file

@ -14,7 +14,7 @@ require_once "DateHelper.php";
require_once "OsPath.php";
require_once "Database.php";
require_once "Timezone.php";
require_once "models/Auth.php";
require_once "Auth.php";
require_once __DIR__.'/forms/helpers/ValidationTypes.php';
require_once __DIR__.'/controllers/plugins/RabbitMqPlugin.php';
require_once __DIR__.'/controllers/plugins/Maintenance.php';