Merge branch 'main' into develop

# Conflicts: # package-lock.json
1.3.1
2025-03-12 09:52:11 +01:00 · 2025-02-07 13:34:22 +01:00 · 2025-02-07 12:33:38 +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",
-  "version": "1.3.0",
+  "version": "1.3.1",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "ff-admin",
-      "version": "1.3.0",
+      "version": "1.3.1",
      "license": "AGPL-3.0-only",
      "dependencies": {
        "@fullcalendar/core": "^6.1.15",
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "ff-admin",
-  "version": "1.3.0",
+  "version": "1.3.1",
  "description": "Feuerwehr/Verein Mitgliederverwaltung UI",
  "type": "module",
  "scripts": {
Author	SHA1	Message	Date
Julian Krauser	d6dc362d65	Merge branch 'main' into develop # Conflicts: # package-lock.json	2025-03-12 09:52:11 +01:00
Julian Krauser	daf131e984	1.3.1	2025-02-07 13:34:22 +01:00
Julian Krauser	1588e1a08c	Merge pull request 'patches v1.3.1' (#58 ) from develop into main Reviewed-on: #58	2025-02-07 12:33:38 +00:00