mirror of
https://github.com/simplex-chat/simplex-chat.git
synced 2026-09-27 00:39:00 +00:00
Merge branch 'stable'
This commit is contained in:
+1
-1
@@ -622,7 +622,7 @@ fun stripFormattedTextLink(ft: List<FormattedText>?, link: String): List<Formatt
|
||||
val i = result.lastIndex
|
||||
if (i >= 0 && result[i].format == null && result[i].text.endsWith("\n")) {
|
||||
result[i] = FormattedText(result[i].text.dropLast(1), null)
|
||||
if (result[i].text.isEmpty()) result.removeLast()
|
||||
if (result[i].text.isEmpty()) result.removeAt(result.lastIndex)
|
||||
}
|
||||
return result.ifEmpty { null }
|
||||
}
|
||||
|
||||
@@ -148,8 +148,9 @@ for os_pair in ${oses}; do
|
||||
-t "${container_name}" \
|
||||
sh -c 'rm -rf ./dist-newstyle ./apps/multiplatform'
|
||||
|
||||
# Also restore git to previous state
|
||||
# Also restore git to previous state + re-initialize submodules
|
||||
git reset --hard && git clean -dfx
|
||||
git submodule update --init --recursive
|
||||
|
||||
# Stop containers, delete images
|
||||
docker stop "${container_name}"
|
||||
|
||||
Reference in New Issue
Block a user