Merge branch 'main' into develop

# Conflicts: # package-lock.json
1.1.0
2025-03-12 09:40:49 +01:00 · 2025-02-15 11:55:41 +01:00 · 2025-02-15 10:55:18 +00: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/webapi-client",
-  "version": "1.0.0",
+  "version": "1.1.0",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "@ff-admin/webapi-client",
-      "version": "1.0.0",
+      "version": "1.1.0",
      "license": "AGPL-3.0-only",
      "dependencies": {
        "axios": "^1.6.2",
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "@ff-admin/webapi-client",
-  "version": "1.0.0",
+  "version": "1.1.0",
  "description": "api client for ff admin webapi",
  "main": "dist/index.js",
  "scripts": {
Author	SHA1	Message	Date
Julian Krauser	16f2049dc4	Merge branch 'main' into develop # Conflicts: # package-lock.json	2025-03-12 09:40:49 +01:00
Julian Krauser	e7457f5de7	1.1.0	2025-02-15 11:55:41 +01:00
Julian Krauser	51d84d5ad6	Merge pull request 'minor v1.1.0' (#1 ) from develop into main Reviewed-on: #1	2025-02-15 10:55:18 +00:00