Merge branch 'main' into develop

1.2.1
Merge pull request 'patches v1.2.1' (#5 ) from develop into main
2025-03-12 10:15:44 +00:00 · 2025-02-14 15:40:06 +01:00 · 2025-02-14 14:39:19 +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.0",
+  "version": "1.2.1",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
    "": {
      "name": "webpage-cms",
-      "version": "1.2.0",
+      "version": "1.2.1",
      "dependencies": {
        "@offset-dev/strapi-calendar": "^1.0.0",
        "@strapi/plugin-color-picker": "5.8.0",
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "webpage-cms",
-  "version": "1.2.0",
+  "version": "1.2.1",
  "private": true,
  "description": "A Strapi application",
  "scripts": {
Author	SHA1	Message	Date
Julian Krauser	9032335344	Merge branch 'main' into develop	2025-03-12 10:15:44 +00:00
Julian Krauser	246b94643b	1.2.1	2025-02-14 15:40:06 +01:00
Julian Krauser	619b84d235	Merge pull request 'patches v1.2.1' (#5 ) from develop into main Reviewed-on: #5	2025-02-14 14:39:19 +00:00