Merge branch 'develop'

# Conflicts:
#	assets/themes/climbing/climbing.json
#	assets/themes/mapcomplete-changes/mapcomplete-changes.json
#	css/index-tailwind-output.css
This commit is contained in:
Pieter Vander Vennet 2022-04-29 23:35:11 +02:00
commit ecba715265
90 changed files with 2564 additions and 2545 deletions

View file

@ -52,6 +52,10 @@
"helperArgs": [
"name",
{
"notInstanceOf": [
"Q79007",
"Q22698"
],
"removePostfixes": [
"steenweg",
"heirbaan",
@ -70,7 +74,9 @@
"wegel",
"kerk",
"church",
"kaai"
"kaai",
"park",
"parque"
]
}
]