Merge remote-tracking branch 'upstream/master'

author Sarah Hoffmann <lonvia@denofr.de>

Fri, 18 Sep 2020 20:41:47 +0000 (22:41 +0200)

committer Sarah Hoffmann <lonvia@denofr.de>

Fri, 18 Sep 2020 20:41:47 +0000 (22:41 +0200)
author Sarah Hoffmann <lonvia@denofr.de>
Fri, 18 Sep 2020 20:41:47 +0000 (22:41 +0200)
committer Sarah Hoffmann <lonvia@denofr.de>
Fri, 18 Sep 2020 20:41:47 +0000 (22:41 +0200)
diff --cc CMakeLists.txt
Simple merge
diff --cc sql/functions/address_lookup.sql
Simple merge
author	Sarah Hoffmann <lonvia@denofr.de>
	Fri, 18 Sep 2020 20:41:47 +0000 (22:41 +0200)
committer	Sarah Hoffmann <lonvia@denofr.de>
	Fri, 18 Sep 2020 20:41:47 +0000 (22:41 +0200)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
sql/functions/address_lookup.sql	patch \|	diff1 \|	diff2 \|	blob \| history