Merge branch 'develop' of ssh://github.com/element-hq/element-web into t3chguy/merge-modules

# Conflicts:
#	pnpm-lock.yaml
This commit is contained in:
Michael Telatynski
2026-06-09 14:05:01 +01:00
5 changed files with 32 additions and 7 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "element-web",
"version": "1.12.20",
"version": "1.12.21",
"description": "Element: the future of secure communication",
"author": "New Vector Ltd.",
"repository": {