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

Merge branch 'main' into develop

Browse source 
# Conflicts:
#	package.json
This commit is contained in:
Julian Krauser 2025-04-21 13:39:19 +02:00
commit 14e9e04d6d
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
package-lock.json generated
View file

@ -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",

2
package.json
View file

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