Merge remote-tracking branch 'origin/master' into gui/lock-everything

# Conflicts:
#	versioning.js
This commit is contained in:
Guillaume St-Pierre 2022-12-11 15:22:28 -05:00
commit 68e7abfa95
3 changed files with 53 additions and 16 deletions

View file

@ -7884,7 +7884,7 @@
<script defer src="modules/ui/burg-editor.js"></script>
<script defer src="modules/ui/units-editor.js"></script>
<script defer src="modules/ui/notes-editor.js"></script>
<script defer src="modules/ui/diplomacy-editor.js"></script>
<script defer src="modules/ui/diplomacy-editor.js?v=1.88.04"></script>
<script defer src="modules/ui/zones-editor.js"></script>
<script defer src="modules/ui/burgs-overview.js"></script>
<script defer src="modules/ui/rivers-overview.js"></script>