Ehrenamt/ff-webpage-cms
1
0
Fork 0
Code Issues Pull requests Projects Releases 11 Packages Wiki Activity Actions

Merge branch 'main' into develop

Browse source 
# Conflicts:
#	package-lock.json
This commit is contained in:
Julian Krauser 2025-07-23 13:48:40 +02:00
commit 63aa6f0531
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
package-lock.json generated
View file

@ -1,12 +1,12 @@
{ {
"name": "ff-webpage-cms", "name": "webpage-cms",
"version": "1.3.0", "version": "1.3.1",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "ff-webpage-cms", "name": "webpage-cms",
"version": "1.3.0", "version": "1.3.1",
"dependencies": { "dependencies": {
"@offset-dev/strapi-calendar": "^1.0.0", "@offset-dev/strapi-calendar": "^1.0.0",
"@strapi/plugin-color-picker": "5.18.1", "@strapi/plugin-color-picker": "5.18.1",

2
package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "ff-webpage-cms", "name": "ff-webpage-cms",
"version": "1.3.0", "version": "1.3.1",
"private": true, "private": true,
"description": "Feuerwehr/Verein Webseite CMS", "description": "Feuerwehr/Verein Webseite CMS",
"scripts": { "scripts": {