Michael 77e8c44016 Merge remote-tracking branch 'upstream/develop' into 1702-only-worker
Conflicts:
	include/onepoll.php
	include/queue.php
2017-03-12 21:03:44 +00:00
..
2017-02-27 06:27:22 +00:00
2017-01-15 15:06:32 +00:00
2017-01-28 11:20:39 +01:00
2017-01-15 15:18:31 +00:00
2017-01-13 17:31:10 +00:00
2017-03-05 11:07:10 +00:00
2017-02-26 23:16:49 +00:00