Merge branch 'main' into develop

1.6.0
Merge pull request 'minor v1.6.0' (#114 ) from develop into main
2025-06-07 13:52:59 +00:00 · 2025-06-06 09:36:53 +02:00 · 2025-06-06 07:35:59 +00:00
2 changed files with 3 additions and 3 deletions
--- a/package-lock.json
+++ b/package-lock.json
@ -1,12 +1,12 @@
 {
  "name": "ff-admin-server",
-  "version": "1.5.4",
+  "version": "1.6.0",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "ff-admin-server",
-      "version": "1.5.4",
+      "version": "1.6.0",
      "license": "AGPL-3.0-only",
      "dependencies": {
        "cors": "^2.8.5",
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "ff-admin-server",
-  "version": "1.5.4",
+  "version": "1.6.0",
  "description": "Feuerwehr/Verein Mitgliederverwaltung Server",
  "main": "dist/index.js",
  "scripts": {
Author	SHA1	Message	Date
Julian Krauser	3f54b5d243	Merge branch 'main' into develop	2025-06-07 13:52:59 +00:00
Julian Krauser	19457824ee	1.6.0	2025-06-06 09:36:53 +02:00
Julian Krauser	e4365135a1	Merge pull request 'minor v1.6.0' (#114 ) from develop into main Reviewed-on: #114	2025-06-06 07:35:59 +00:00