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

# Conflicts: # src/command/club/member/memberCommandHandler.ts # src/data-source.ts # src/entity/club/member/member.ts # src/service/club/member/memberService.ts
Merge branch 'main' into develop
2025-01-31 11:51:38 +01:00 · 2025-01-31 11:50:39 +01:00 · 2025-01-31 11:42:55 +01:00 · 2025-01-31 10:42:32 +00:00 · 2025-01-31 11:40:59 +01:00 · 2025-01-27 15:20:22 +01:00
2 changed files with 3 additions and 3 deletions
--- a/package-lock.json
+++ b/package-lock.json
@ -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",
--- a/package.json
+++ b/package.json
@ -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": {
Author	SHA1	Message	Date
Julian Krauser	0f621ac46d	Merge branch 'develop' into feature/#34-backup-&-import # Conflicts: # src/command/club/member/memberCommandHandler.ts # src/data-source.ts # src/entity/club/member/member.ts # src/service/club/member/memberService.ts	2025-01-31 11:51:38 +01:00
Julian Krauser	0468a4f331	Merge branch 'main' into develop	2025-01-31 11:50:39 +01:00
Julian Krauser	1d9970fc56	1.2.2	2025-01-31 11:42:55 +01:00
Julian Krauser	29be563942	Merge pull request 'patches: v1.2.2' (#56 ) from develop into main Reviewed-on: #56	2025-01-31 10:42:32 +00:00
Julian Krauser	fc694aa976	change: newsletter saving	2025-01-31 11:40:59 +01:00
Julian Krauser	7a3a8a9d87	1.2.1	2025-01-27 15:20:22 +01:00
Julian Krauser	3165eb789f	Merge pull request 'patches v1.2.1' (#54 ) from develop into main Reviewed-on: #54	2025-01-27 14:19:55 +00:00
Julian Krauser	d9132e472b	1.2.0	2025-01-23 13:15:14 +01:00
Julian Krauser	c661a588c5	Merge pull request 'minor v1.2.0' (#51 ) from develop into main Reviewed-on: #51	2025-01-23 12:14:24 +00:00
Julian Krauser	3e256dc2f7	1.1.1	2025-01-20 12:49:04 +01:00
Julian Krauser	bf5aec351c	Merge pull request 'patches v1.1.1' (#46 ) from develop into main Reviewed-on: #46	2025-01-20 11:48:30 +00:00
Julian Krauser	28e05c70a9	1.1.0	2025-01-19 13:57:59 +01:00
Julian Krauser	1116b50773	Merge pull request 'minor: v1.1.0' (#45 ) from develop into main Reviewed-on: #45	2025-01-19 12:56:41 +00:00