From 263f1a733ebc7f09162302a9575f61fdeccf4f0f Mon Sep 17 00:00:00 2001 From: "marcel.kocisek" Date: Thu, 17 Jul 2025 09:46:43 +0200 Subject: [PATCH 1/2] 2025.6.0 --- server/mergin/version.py | 2 +- server/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/mergin/version.py b/server/mergin/version.py index 694adecc..57789e53 100644 --- a/server/mergin/version.py +++ b/server/mergin/version.py @@ -4,4 +4,4 @@ def get_version(): - return "2025.5.1" + return "2025.6.0" diff --git a/server/setup.py b/server/setup.py index 3d001842..942a14db 100644 --- a/server/setup.py +++ b/server/setup.py @@ -6,7 +6,7 @@ setup( name="mergin", - version="2025.5.1", + version="2025.6.0", url="https://github.com/MerginMaps/mergin", license="AGPL-3.0-only", author="Lutra Consulting Limited", From 27ab5af1a75b6b8b44fb4affac433051cc7f1f31 Mon Sep 17 00:00:00 2001 From: "marcel.kocisek" Date: Tue, 22 Jul 2025 13:39:12 +0200 Subject: [PATCH 2/2] bump version 6.1 --- server/mergin/version.py | 2 +- server/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/mergin/version.py b/server/mergin/version.py index 57789e53..4de9690b 100644 --- a/server/mergin/version.py +++ b/server/mergin/version.py @@ -4,4 +4,4 @@ def get_version(): - return "2025.6.0" + return "2025.6.1" diff --git a/server/setup.py b/server/setup.py index 942a14db..ac06d2ba 100644 --- a/server/setup.py +++ b/server/setup.py @@ -6,7 +6,7 @@ setup( name="mergin", - version="2025.6.0", + version="2025.6.1", url="https://github.com/MerginMaps/mergin", license="AGPL-3.0-only", author="Lutra Consulting Limited",