Merge develop into 3-timeline

Fixing merge conflict
2024-03-29 11:29:48 +01:00 · 2024-03-29 11:29:48 +01:00 · 3983ab0de2
parent ccefa2ed9b bbe1eeef12
commit 3983ab0de2
2 changed files with 2 additions and 2 deletions
--- a/elm.json
+++ b/elm.json
@ -3,7 +3,7 @@
    "name": "noordstar/elm-matrix-sdk-beta",
    "summary": "Matrix SDK for instant communication. Unstable beta version for testing only.",
    "license": "EUPL-1.1",
-    "version": "2.1.1",
+    "version": "2.1.2",
    "exposed-modules": [
        "Internal.Config.Default",
        "Internal.Config.Leaks",
--- a/src/Internal/Config/Default.elm
+++ b/src/Internal/Config/Default.elm
@ -23,7 +23,7 @@ will assume until overriden by the user.
 -}
 currentVersion : String
 currentVersion =
-    "beta 2.1.1"
+    "beta 2.1.2"


 {-| The default device name that is being communicated with the Matrix API.