Merge remote-tracking branch 'origin/main'

# Conflicts:
#	templates/add_spot.html
#	templates/alerts.html
#	templates/bands.html
#	templates/base.html
#	templates/conditions.html
#	templates/map.html
#	templates/spots.html
#	templates/status.html
This commit is contained in:
Ian Renton
2026-09-19 10:49:36 +01:00
11 changed files with 19 additions and 19 deletions
+2 -2
View File
@@ -113,8 +113,8 @@
const CARTODB_API_KEY = "{{ web_ui_options.get('cartodb_api_key', '') }}";
</script>
<script src="/static/js/spotsbandsandmap.js?v=1789811349"></script>
<script src="/static/js/map.js?v=1789811349"></script>
<script src="/static/js/spotsbandsandmap.js?v=1789811377"></script>
<script src="/static/js/map.js?v=1789811377"></script>
<script>$(document).ready(function () {
$("#nav-link-map").addClass("active");
}); <!-- highlight active page in nav --></script>