Merge branch 'main' into develop

# Conflicts: # package-lock.json
1.3.4
2025-03-12 09:51:43 +01:00 · 2025-02-09 17:26:34 +01:00 · 2025-02-09 16:25:57 +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.3",
+  "version": "1.3.4",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "ff-admin-server",
-      "version": "1.3.3",
+      "version": "1.3.4",
      "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.3",
+  "version": "1.3.4",
  "description": "Feuerwehr/Verein Mitgliederverwaltung Server",
  "main": "dist/index.js",
  "scripts": {
Author	SHA1	Message	Date
Julian Krauser	49cb4e4d23	Merge branch 'main' into develop # Conflicts: # package-lock.json	2025-03-12 09:51:43 +01:00
Julian Krauser	6263b410c6	1.3.4	2025-02-09 17:26:34 +01:00
Julian Krauser	c787761335	Merge pull request 'patches v1.3.4' (#62 ) from develop into main Reviewed-on: #62	2025-02-09 16:25:57 +00:00