Merge master into branch

This commit is contained in:
Guillaume St-Pierre 2022-12-15 09:44:45 -05:00
commit 2053a7d530
4 changed files with 13 additions and 4 deletions

View file

@ -7849,7 +7849,7 @@
<script src="modules/military-generator.js"></script>
<script src="modules/markers-generator.js?v=1.87.13"></script>
<script src="modules/coa-generator.js"></script>
<script src="modules/submap.js"></script>
<script src="modules/submap.js?v=1.88.05"></script>
<script src="libs/polylabel.min.js"></script>
<script src="libs/lineclip.min.js"></script>
<script src="libs/alea.min.js"></script>
@ -7903,7 +7903,7 @@
<script defer src="libs/jquery.ui.touch-punch.min.js"></script>
<script defer src="modules/io/save.js"></script>
<script defer src="modules/io/load.js?v=1.88.01"></script>
<script defer src="modules/io/load.js?v=1.88.05"></script>
<script defer src="modules/io/cloud.js"></script>
<script defer src="modules/io/export.js"></script>
<script defer src="modules/io/formats.js"></script>