Merge upstream

This commit is contained in:
Pieter Vander Vennet 2022-12-16 13:40:25 +01:00
parent 87b7bd9bc2
commit 0bd28b996c
124 changed files with 2643 additions and 1009 deletions

View file

@ -167,6 +167,6 @@ This tagrendering has no question and is thus read-only
Only visible if `wikidata~.+` is shown
This tagrendering is only visible in the popup if the following condition is met: `wikidata~.+`
This document is autogenerated from [assets/themes/etymology/etymology.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/themes/etymology/etymology.json)