IT-Naturschutz/konova
7
0
Fork 0
Code Issues 6 Pull Requests Actions Projects Releases 44 Wiki Activity

Merge branch 'master' into 138_New_map_client

Browse Source 
# Conflicts:
#	konova/models/geometry.py
#	konova/urls.py
#	locale/de/LC_MESSAGES/django.mo
#	locale/de/LC_MESSAGES/django.po
This commit is contained in:
mpeltriaux
2022-05-25 09:22:15 +02:00
parent 57aa39a670 fec43e1bed
commit 4f482595c6
32 changed files with 483 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ema/templates/ema/detail/view.html
View File

@@ -92,7 +92,7 @@
</div>
</div>
<div class="row">
{% include 'konova/includes/parcels.html' %}
{% include 'konova/includes/parcels/parcels.html' %}
</div>
<div class="row">
{% include 'konova/includes/comment_card.html' %}

2
ema/templates/ema/report/report.html
View File

@@ -40,7 +40,7 @@
</div>
</div>
<div class="row">
{% include 'konova/includes/parcels.html' %}
{% include 'konova/includes/parcels/parcels.html' %}
</div>
<div class="row">
{% include 'konova/includes/report/qrcodes.html' %}