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

# Conflicts:
#	pnpm-lock.yaml
#	pnpm-workspace.yaml
This commit is contained in:
Michael Telatynski
2026-06-09 12:39:57 +01:00
46 changed files with 439 additions and 422 deletions
+9 -1
View File
@@ -55,7 +55,15 @@ export default {
// Brought in via hak scripts
"matrix-seshat",
],
ignoreBinaries: ["scripts/in-docker.sh"],
ignoreBinaries: [
"scripts/in-docker.sh",
// Used to build seshat (optional)
"rustc",
// Used by the fetch-package script (optional)
"gpg",
// Used for the macOS universal builds
"lipo",
],
},
"modules/*": {
entry: "src/index.ts{x,}",