Merge branch 'master' into develop

.github/workflows/build_debian.yaml

@@ -57,7 +57,6 @@ jobs:
             - name: Build deb package
               run: |
                   VERSION=$(cat package.json | jq -r .version)
-                  sudo chmod -R u=rw,go=r debian/tmp/usr/share/element-web/
                   dpkg-gencontrol -v"$VERSION" -ldebian/tmp/DEBIAN/changelog
                   dpkg-deb -Zxz --root-owner-group --build debian/tmp element-web.deb
 

.github/workflows/release-gitflow.yml

@@ -7,7 +7,8 @@ concurrency: ${{ github.repository }}-${{ github.workflow }}
 jobs:
     merge:
         uses: matrix-org/matrix-js-sdk/.github/workflows/release-gitflow.yml@develop
-        secrets: inherit
+        secrets:
+            ELEMENT_BOT_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
         with:
             dependencies: |
                 matrix-react-sdk