Merge remote-tracking branch 'upstream/master'

author Sarah Hoffmann <lonvia@denofr.de>

Thu, 17 Apr 2025 13:18:29 +0000 (15:18 +0200)

committer Sarah Hoffmann <lonvia@denofr.de>

Thu, 17 Apr 2025 13:18:29 +0000 (15:18 +0200)
author Sarah Hoffmann <lonvia@denofr.de>
Thu, 17 Apr 2025 13:18:29 +0000 (15:18 +0200)
committer Sarah Hoffmann <lonvia@denofr.de>
Thu, 17 Apr 2025 13:18:29 +0000 (15:18 +0200)
diff --cc src/nominatim_api/search/db_search_builder.py
Simple merge
diff --cc src/nominatim_api/search/icu_tokenizer.py
Simple merge
diff --cc src/nominatim_db/tokenizer/icu_tokenizer.py
Simple merge
author	Sarah Hoffmann <lonvia@denofr.de>
	Thu, 17 Apr 2025 13:18:29 +0000 (15:18 +0200)
committer	Sarah Hoffmann <lonvia@denofr.de>
	Thu, 17 Apr 2025 13:18:29 +0000 (15:18 +0200)
		1	2
src/nominatim_api/search/db_search_builder.py	patch \|	diff1 \|	diff2 \|	blob \| history
src/nominatim_api/search/icu_tokenizer.py	patch \|	diff1 \|	diff2 \|	blob \| history
src/nominatim_db/tokenizer/icu_tokenizer.py	patch \|	diff1 \|	diff2 \|	blob \| history