Merge branch 'main' of https://github.com/Eskimue/skyview.astronomiemuseum.de

2026-04-06 09:26:59 +02:00
parent a70e46b307 fc3264cc2f
commit 078c7ac8d0
26 changed files with 619 additions and 797 deletions
@@ -1,3 +1,8 @@
+<<<<<<< HEAD
 php-server.log
 php-server.err.log
-php-server-error.log
+php-server-error.log
+=======
+.codex-temp/
+php-server-error.log
+>>>>>>> fc3264cc2fa76249c40e422de2381eb7c6920c28