Merge branch 'master' of git.martlubbers.net:clean-tests

author Mart Lubbers <mart@martlubbers.net>

Mon, 23 Mar 2020 07:34:17 +0000 (08:34 +0100)

committer Mart Lubbers <mart@martlubbers.net>

Mon, 23 Mar 2020 07:34:17 +0000 (08:34 +0100)
author Mart Lubbers <mart@martlubbers.net>
Mon, 23 Mar 2020 07:34:17 +0000 (08:34 +0100)
committer Mart Lubbers <mart@martlubbers.net>
Mon, 23 Mar 2020 07:34:17 +0000 (08:34 +0100)
diff --cc cloudiTasks/cloudiTasks.icl
Simple merge
diff --cc cloudiTasks/slave/cloudiTasks

index 6c6bf4d,6c6bf4d..0000000

deleted file mode 100755,100755

Binary files differ
author	Mart Lubbers <mart@martlubbers.net>
	Mon, 23 Mar 2020 07:34:17 +0000 (08:34 +0100)
committer	Mart Lubbers <mart@martlubbers.net>
	Mon, 23 Mar 2020 07:34:17 +0000 (08:34 +0100)
		1	2
cloudiTasks/cloudiTasks.icl	patch \|	diff1 \|	diff2 \|	blob \| history
cloudiTasks/slave/cloudiTasks	patch \|	blob1 \|	blob2 \|	history