Merge commit '3b1e6ce6a40f28ae49e8e3dde794eeafcde19cb9'

This commit is contained in:
2025-06-15 21:19:29 +02:00
472 changed files with 6185 additions and 760 deletions

View File

@ -82,5 +82,12 @@
2025-06-12 21:00:49 - [user] user - [INFO] INFO - User admin accessed settings page
2025-06-12 21:00:49 - [user] user - [INFO] INFO - User admin retrieved settings via API
2025-06-12 21:01:00 - [user] user - [INFO] INFO - User admin updated settings via API
<<<<<<< HEAD
2025-06-13 20:55:21 - [user] user - [INFO] INFO - User admin accessed settings page
2025-06-13 20:55:21 - [user] user - [INFO] INFO - User admin retrieved settings via API
=======
2025-06-13 07:14:11 - [user] user - [INFO] INFO - User admin accessed settings page
2025-06-13 07:14:11 - [user] user - [INFO] INFO - User admin retrieved settings via API
2025-06-13 07:17:07 - [user] user - [INFO] INFO - User admin accessed settings page
2025-06-13 07:17:12 - [user] user - [INFO] INFO - User admin accessed settings page
>>>>>>> 3b1e6ce6a40f28ae49e8e3dde794eeafcde19cb9