fix: resolve merge conflicts in build_and_deploy.yaml and base.html files

Tracking added
Zola workflow updated
2025-08-27 19:05:11 +02:00 · 2024-11-16 20:28:38 +01:00 · 2024-10-14 17:03:56 +02:00 · 2024-09-11 20:07:51 +02:00 · 2024-09-11 19:55:36 +02:00
1 changed files with 1 additions and 0 deletions
--- a/templates/base.html
+++ b/templates/base.html
@@ -28,6 +28,7 @@
    <script defer src="/js/mobile-navbar.js"></script>
 		{% block styles %}
 		{% endblock styles %}
 		<script defer data-domain="filiprojek.cz" src="https://analytics.fofrweb.com/js/script.js"></script>
 	</head>
 	<body>
 		<header>
Author	SHA1	Message	Date
Filip Rojek	23ed4cb57a	fix: resolve merge conflicts in build_and_deploy.yaml and base.html files All checks were successful Build and Deploy Zola Website / build_and_deploy (push) Successful in 16s Details Build Zola Website / build (pull_request) Has been skipped Details	2025-08-27 19:05:11 +02:00
Filip Rojek	8a0b002a03	Tracking added All checks were successful Build and Deploy Zola Website / build_and_deploy (push) Successful in 12s Details	2024-11-16 20:28:38 +01:00
Filip Rojek	5623e8ab00	Zola workflow updated All checks were successful Build and Deploy Zola Website / build_and_deploy (push) Successful in 16s Details	2024-10-14 17:03:56 +02:00
Filip Rojek	0e034f3382	Merge branch 'fr/analytics'	2024-09-11 20:07:51 +02:00
Filip Rojek	29ccd54013	Added: analytics script All checks were successful Build Zola Website / build (pull_request) Successful in 20s Details	2024-09-11 19:55:36 +02:00