Merge remote-tracking branch 'upstream/develop' into no-frontend-worker
authorMichael <heluecht@pirati.ca>
Thu, 7 Jan 2021 10:44:12 +0000 (10:44 +0000)
committerMichael <heluecht@pirati.ca>
Thu, 7 Jan 2021 10:44:12 +0000 (10:44 +0000)
1  2 
src/Core/Worker.php
static/defaults.config.php

Simple merge
Simple merge