Merge branch 'main' into develop

1.3.6
Merge pull request 'patches v1.3.3' (#78 ) from develop into main
2025-03-24 08:21:08 +00:00 · 2025-03-21 10:49:17 +01:00 · 2025-03-21 09:47: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.3.5",
+  "version": "1.3.6",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "ff-admin-server",
-      "version": "1.3.5",
+      "version": "1.3.6",
      "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.3.5",
+  "version": "1.3.6",
  "description": "Feuerwehr/Verein Mitgliederverwaltung Server",
  "main": "dist/index.js",
  "scripts": {
Author	SHA1	Message	Date
Julian Krauser	c0a0365406	Merge branch 'main' into develop	2025-03-24 08:21:08 +00:00
Julian Krauser	7fdae81680	1.3.6	2025-03-21 10:49:17 +01:00
Julian Krauser	d59f5b0767	Merge pull request 'patches v1.3.3' (#78 ) from develop into main Reviewed-on: #78	2025-03-21 09:47:59 +00:00