- Rebases master

This commit is contained in:
MrCasual
2015-11-27 07:46:26 -05:00
parent b7fe8dc6d6
commit 98005a2a6f
2 changed files with 2 additions and 5 deletions

View File

@@ -129,7 +129,7 @@ class Initializer {
$hooks->init(); $hooks->init();
} }
function setupPublicAPI() { function setupPublicAPI() {
$publicAPI = new PublicAPI(); $publicAPI = new PublicAPI();
$publicAPI->init(); $publicAPI->init();
} }
@@ -138,8 +138,6 @@ class Initializer {
try { try {
$supervisor = new Supervisor(); $supervisor = new Supervisor();
$supervisor->checkDaemon(); $supervisor->checkDaemon();
} catch (\Exception $e) { } catch (\Exception $e) {}
}
}
} }
} }

View File

@@ -1,7 +1,6 @@
<?php <?php
namespace MailPoet\Config; namespace MailPoet\Config;
use MailPoet\Subscribers\ImportExport\BootStrapMenu;
use MailPoet\Form\Block; use MailPoet\Form\Block;
use MailPoet\Form\Renderer as FormRenderer; use MailPoet\Form\Renderer as FormRenderer;
use MailPoet\Models\Form; use MailPoet\Models\Form;