Michael Telatynski 3d2361257a Merge branch 'develop' of https://github.com/vector-im/element-web into t3chguy/playwright-tenbin ...

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	.github/workflows/end-to-end-tests.yaml
#	package.json
#	playwright/e2e/crypto/backups-mas.spec.ts
#	playwright/e2e/csAPI.ts
#	playwright/e2e/login/utils.ts
#	playwright/e2e/right-panel/right-panel.spec.ts
#	playwright/e2e/spotlight/spotlight.spec.ts
#	playwright/element-web-test.ts
#	playwright/pages/client.ts
#	playwright/plugins/homeserver/index.ts
#	playwright/plugins/homeserver/synapse/legacyOAuthHomeserver.ts
#	playwright/plugins/oauth_server/index.ts
#	playwright/services.ts
#	playwright/testcontainers/HomeserverContainer.ts
#	playwright/testcontainers/dendrite.ts
#	playwright/testcontainers/mas.ts
#	playwright/testcontainers/synapse.ts
#	playwright/testcontainers/utils.ts
#	yarn.lock

2025-03-17 14:16:06 +00:00

3.2 KiB

Raw Permalink Blame History

View Raw