Merge branch 'main' into develop

1.0.2
Merge pull request 'patches v1.0.2' (#39 ) from develop into main
2025-01-19 12:56:31 +00:00 · 2025-01-13 11:23:16 +01:00 · 2025-01-13 10:22:29 +00:00 · 2025-01-10 12:10:33 +01:00 · 2025-01-10 11:10:00 +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.0.0",
+  "version": "1.0.2",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "ff-admin-server",
-      "version": "1.0.0",
+      "version": "1.0.2",
      "license": "GPL-3.0-only",
      "dependencies": {
        "cors": "^2.8.5",
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "ff-admin-server",
-  "version": "1.0.0",
+  "version": "1.0.2",
  "description": "Feuerwehr/Verein Mitgliederverwaltung Server",
  "main": "dist/index.js",
  "scripts": {
Author	SHA1	Message	Date
Julian Krauser	8b59f3b7a8	Merge branch 'main' into develop	2025-01-19 12:56:31 +00:00
Julian Krauser	c803c2a583	1.0.2	2025-01-13 11:23:16 +01:00
Julian Krauser	ba03b6f097	Merge pull request 'patches v1.0.2' (#39 ) from develop into main Reviewed-on: #39	2025-01-13 10:22:29 +00:00
Julian Krauser	69134b210a	1.0.1	2025-01-10 12:10:33 +01:00
Julian Krauser	0f7516bd3d	Merge pull request 'patches v1.0.1' (#38 ) from develop into main Reviewed-on: #38	2025-01-10 11:10:00 +00:00