Michael Telatynski 46db71b3c2
Merge branch 'develop' of ssh://github.com/element-hq/element-web into t3chguy/element-web-monorepo
# Conflicts:
#	apps/element-web/playwright/e2e/settings/encryption-user-tab/other-devices.spec.ts
#	apps/element-web/src/device-listener/DeviceListenerCurrentDevice.ts
#	apps/element-web/src/device-listener/DeviceState.ts
#	package.json
#	yarn.lock
2026-02-11 10:02:33 +00:00
..
2023-11-21 21:07:33 +00:00
2022-12-09 13:28:29 +01:00
2026-02-04 14:19:45 +00:00
2022-12-09 13:28:29 +01:00
2022-12-12 12:24:14 +01:00
2021-03-11 09:19:59 -07:00
2025-09-25 09:27:40 +00:00
2026-02-04 14:19:45 +00:00
2021-08-23 17:14:49 +01:00
2022-12-12 12:24:14 +01:00
2026-01-16 16:06:24 +00:00
2026-02-04 14:19:45 +00:00
2022-12-12 12:24:14 +01:00
2022-12-12 12:24:14 +01:00