Merge pull request #13512 from msekletar/freezer

author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>

Fri, 1 May 2020 05:52:29 +0000 (07:52 +0200)

committer GitHub <noreply@github.com>

Fri, 1 May 2020 05:52:29 +0000 (07:52 +0200)
author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Fri, 1 May 2020 05:52:29 +0000 (07:52 +0200)
committer GitHub <noreply@github.com>
Fri, 1 May 2020 05:52:29 +0000 (07:52 +0200)
diff --cc src/core/service.c
Simple merge
diff --cc test/test-functions
Simple merge
author	Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
	Fri, 1 May 2020 05:52:29 +0000 (07:52 +0200)
committer	GitHub <noreply@github.com>
	Fri, 1 May 2020 05:52:29 +0000 (07:52 +0200)
		1	2
src/core/service.c	patch \|	diff1 \|	diff2 \|	blob \| history
test/test-functions	patch \|	diff1 \|	diff2 \|	blob \| history