merge: beta into master

2026-05-19 09:35:15 +02:00
parent 254adfa12a e744b1829e
commit d3fa591bef
7 changed files with 189 additions and 1 deletions
--- a/frontend/js/version.js
+++ b/frontend/js/version.js
@@ -1,2 +1,6 @@
 // Increment APP_VERSION with every code change
+<<<<<<< HEAD
 export const APP_VERSION = 'v17';
+=======
+export const APP_VERSION = 'v11';
+>>>>>>> e744b1829e99db6b80922f75542ced329138e474