summaryrefslogtreecommitdiff
path: root/archaeological_warehouse/templates
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2020-04-10 16:34:33 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2021-02-28 12:15:20 +0100
commit69cf0a7de4b4d842c814e83f28f7d45aec69929c (patch)
tree1a7567e73ab784209a74ede0481bfc2e21079748 /archaeological_warehouse/templates
parentda80b35938a3bd8690c60959f0d39873d1d2cfd1 (diff)
downloadIshtar-69cf0a7de4b4d842c814e83f28f7d45aec69929c.tar.bz2
Ishtar-69cf0a7de4b4d842c814e83f28f7d45aec69929c.zip
Fix merge candidate for containers
Diffstat (limited to 'archaeological_warehouse/templates')
-rw-r--r--archaeological_warehouse/templates/ishtar/wizard/wizard_container.html (renamed from archaeological_warehouse/templates/ishtar/wizard/wizard_containerlocalisation.html)0
1 files changed, 0 insertions, 0 deletions
diff --git a/archaeological_warehouse/templates/ishtar/wizard/wizard_containerlocalisation.html b/archaeological_warehouse/templates/ishtar/wizard/wizard_container.html
index 4d0a63c17..4d0a63c17 100644
--- a/archaeological_warehouse/templates/ishtar/wizard/wizard_containerlocalisation.html
+++ b/archaeological_warehouse/templates/ishtar/wizard/wizard_container.html