Merge remote-tracking branch 'upstream/develop' into no-frontend-worker

author Michael <heluecht@pirati.ca>

Thu, 7 Jan 2021 10:44:12 +0000 (10:44 +0000)

committer Michael <heluecht@pirati.ca>

Thu, 7 Jan 2021 10:44:12 +0000 (10:44 +0000)
author Michael <heluecht@pirati.ca>
Thu, 7 Jan 2021 10:44:12 +0000 (10:44 +0000)
committer Michael <heluecht@pirati.ca>
Thu, 7 Jan 2021 10:44:12 +0000 (10:44 +0000)
diff --cc src/Core/Worker.php
Simple merge
diff --cc static/defaults.config.php
Simple merge
author	Michael <heluecht@pirati.ca>
	Thu, 7 Jan 2021 10:44:12 +0000 (10:44 +0000)
committer	Michael <heluecht@pirati.ca>
	Thu, 7 Jan 2021 10:44:12 +0000 (10:44 +0000)
		1	2
src/Core/Worker.php	patch \|	diff1 \|	diff2 \|	blob \| history
static/defaults.config.php	patch \|	diff1 \|	diff2 \|	blob \| history