Michael Telatynski
|
99af4a49a7
|
Merge branch 'develop' of https://github.com/vector-im/element-web into t3chguy/playwright-testcontainers
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
# Conflicts:
# playwright/plugins/docker/index.ts
# playwright/plugins/homeserver/synapse/index.ts
# playwright/plugins/mailhog/index.ts
# playwright/plugins/matrix-authentication-service/index.ts
# playwright/plugins/postgres/index.ts
# playwright/plugins/sliding-sync-proxy/index.ts
|
2025-01-06 11:57:59 +00:00 |