Merge branch 'main' into develop

# Conflicts: # package.json
1.2.2
2025-04-21 13:39:19 +02:00 · 2025-03-12 11:17:38 +01:00 · 2025-03-12 10:16:02 +00:00
2 changed files with 3 additions and 3 deletions
--- a/package-lock.json
+++ b/package-lock.json
@ -1,12 +1,12 @@
 {
  "name": "webpage-cms",
-  "version": "1.2.1",
+  "version": "1.2.2",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
    "": {
      "name": "webpage-cms",
-      "version": "1.2.1",
+      "version": "1.2.2",
      "dependencies": {
        "@offset-dev/strapi-calendar": "^1.0.0",
        "@strapi/plugin-color-picker": "5.12.5",
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "ff-webpage-cms",
-  "version": "1.2.1",
+  "version": "1.2.2",
  "private": true,
  "description": "Feuerwehr/Verein Webseite CMS",
  "scripts": {
Author	SHA1	Message	Date
Julian Krauser	14e9e04d6d	Merge branch 'main' into develop # Conflicts: # package.json	2025-04-21 13:39:19 +02:00
Julian Krauser	88502474d8	1.2.2	2025-03-12 11:17:38 +01:00
Julian Krauser	b5344e8dc8	Merge pull request 'patches v1.2.2' (#6 ) from develop into main Reviewed-on: #6	2025-03-12 10:16:02 +00:00