Ehrenamt/ff-admin-server
2
0
Fork 0
Code Issues 10 Pull requests Projects Releases 8 Packages Wiki Activity Actions

Merge branch 'develop' into feature/#34-backup-&-import

Browse source 
# Conflicts:
#	src/command/club/member/memberCommandHandler.ts
#	src/data-source.ts
#	src/entity/club/member/member.ts
#	src/service/club/member/memberService.ts
This commit is contained in:
Julian Krauser 2025-01-31 11:51:38 +01:00
commit 0f621ac46d
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": "ff-admin-server",
"version": "1.0.2",
"version": "1.2.2",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "ff-admin-server",
"version": "1.0.2",
"version": "1.2.2",
"license": "GPL-3.0-only",
"dependencies": {
"cors": "^2.8.5",

2
package.json
View file

@ -1,6 +1,6 @@
{
"name": "ff-admin-server",
"version": "1.0.2",
"version": "1.2.2",
"description": "Feuerwehr/Verein Mitgliederverwaltung Server",
"main": "dist/index.js",
"scripts": {