Jonathan Labreuille da6e154642 fixed conflicts

2015-12-04 11:25:06 +01:00

..

BootStrapMenu.php

- Places supervisor/daemon/worker under the new Cron class

2015-12-03 22:01:18 -05:00

Daemon.php

fixed conflicts

2015-12-04 11:25:06 +01:00

Supervisor.php

- Places supervisor/daemon/worker under the new Cron class

2015-12-03 22:01:18 -05:00

Worker.php

fixed conflicts

2015-12-04 11:25:06 +01:00