deploy/update-flathub.sh

@@ -20,11 +20,8 @@ debdate=$(date +%Y-%m-%d -r $debpath)
 pushd "$repopath" > /dev/null
 
 git fetch
-git checkout master
 git reset --hard origin/master
 
-git checkout -B "release-v$version"
-
 yamlFile="chat.schildi.desktop.yaml"
 xmlFile="chat.schildi.desktop.metainfo.xml"
 
@@ -36,8 +33,8 @@ sed -i "s|^\s\s<releases>$|  <releases>\n    <release version=\"$version\" date=
 git add $yamlFile $xmlFile
 git commit -m "Bump version to v$version"
 
-git push -f --set-upstream origin "release-v$version"
+git push
 
 popd > /dev/null
 
-echo "Release v$version published on flathub, now merge that branch as PR: https://github.com/flathub/chat.schildi.desktop/"
+echo "Release v$version published on flathub!"

element-desktop

@@ -1 +1 @@
-Subproject commit 07d1283f2388a1c748f6d5848740730ad6b7ee00
+Subproject commit 66490633aab37e120a68c8e0e895dfdb6a583f29

element-web

@@ -1 +1 @@
-Subproject commit d7e4930ab4efced752493957b37c1afb0aeb9d0b
+Subproject commit 8ed0e546a9cdae94b58e154d8d3fbd404220bf72

generate_changelog.sh

@@ -16,8 +16,8 @@ forall_repos check_branch $branch
 forall_repos check_clean_git
 
 # Fetch upstream
-forall_repos git fetch origin > /dev/null 2>/dev/null
-forall_repos git fetch upstream > /dev/null 2>/dev/null
+forall_repos git fetch origin > /dev/null
+forall_repos git fetch upstream > /dev/null
 
 (
     # Add new line below git log: https://unix.stackexchange.com/a/345558

i18n-overlays/element-desktop/ja.json

@@ -1 +0,0 @@
-{}

i18n-overlays/element-web/ja.json

@@ -1 +0,0 @@
-{}

i18n-overlays/matrix-react-sdk/ja.json

@@ -1,3 +0,0 @@
-{
-    "Normal priority": "常優先度"
-}

matrix-js-sdk

@@ -1 +1 @@
-Subproject commit 14742043de61ac9844c78204ffb93a783fa2c676
+Subproject commit cb81a65097a0bb861da9e7384cb7469ed42e7a58

matrix-react-sdk

@@ -1 +1 @@
-Subproject commit c9fb6bbbb8bf97802277127601163618669acdee
+Subproject commit d140a7a09455dc85f837080fd778d24c9166968f