Merge pull request #1971 from lonvia/drop-support-for-isin

author Sarah Hoffmann <lonvia@denofr.de>

Wed, 23 Sep 2020 07:20:35 +0000 (09:20 +0200)

committer GitHub <noreply@github.com>

Wed, 23 Sep 2020 07:20:35 +0000 (09:20 +0200)
author Sarah Hoffmann <lonvia@denofr.de>
Wed, 23 Sep 2020 07:20:35 +0000 (09:20 +0200)
committer GitHub <noreply@github.com>
Wed, 23 Sep 2020 07:20:35 +0000 (09:20 +0200)
diff --cc settings/import-full.style
Simple merge
diff --cc sql/functions/placex_triggers.sql
Simple merge
author	Sarah Hoffmann <lonvia@denofr.de>
	Wed, 23 Sep 2020 07:20:35 +0000 (09:20 +0200)
committer	GitHub <noreply@github.com>
	Wed, 23 Sep 2020 07:20:35 +0000 (09:20 +0200)
		1	2
settings/import-full.style	patch \|	diff1 \|	diff2 \|	blob \| history
sql/functions/placex_triggers.sql	patch \|	diff1 \|	diff2 \|	blob \| history