Merge develop into 3-timeline

Fixing merge conflict
pull/17/head
Bram 2024-03-29 11:29:48 +01:00
commit 3983ab0de2
2 changed files with 2 additions and 2 deletions

View File

@ -3,7 +3,7 @@
"name": "noordstar/elm-matrix-sdk-beta", "name": "noordstar/elm-matrix-sdk-beta",
"summary": "Matrix SDK for instant communication. Unstable beta version for testing only.", "summary": "Matrix SDK for instant communication. Unstable beta version for testing only.",
"license": "EUPL-1.1", "license": "EUPL-1.1",
"version": "2.1.1", "version": "2.1.2",
"exposed-modules": [ "exposed-modules": [
"Internal.Config.Default", "Internal.Config.Default",
"Internal.Config.Leaks", "Internal.Config.Leaks",

View File

@ -23,7 +23,7 @@ will assume until overriden by the user.
-} -}
currentVersion : String currentVersion : String
currentVersion = currentVersion =
"beta 2.1.1" "beta 2.1.2"
{-| The default device name that is being communicated with the Matrix API. {-| The default device name that is being communicated with the Matrix API.