Romain Neutron a805c94524 Merge branch '3.8' ...

Conflicts:
	composer.json
	composer.lock
	lib/classes/task/Scheduler.php

2013-10-21 19:05:37 +02:00

..

period

Merge branch '3.8'

2013-10-10 13:42:42 +02:00

abstract.php

Merge branch '3.8'

2013-10-03 15:29:22 +02:00

appboxAbstract.php

Remove sleep calls

2013-09-04 14:51:00 +02:00

databoxAbstract.php

Remove sleep calls

2013-09-04 14:51:00 +02:00

manager.php

fix #1496

2013-10-14 16:58:32 +02:00

Scheduler.php

Merge branch '3.8'

2013-10-21 19:05:37 +02:00