mpeltriaux dd5cbbef10 Merge branch 'master' into 132_Old_entries ...

# Conflicts:
#	konova/management/commands/update_all_parcels.py
#	konova/urls.py
#	user/admin.py

2022-06-01 13:12:35 +02:00

..

ema

Merge branch 'master' into 132_Old_entries

2022-06-01 13:12:35 +02:00