mirrors/element-web
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2026-05-05 20:26:19 +02:00
Code Issues Projects Releases Wiki Activity
element-web/packages
History
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
..
shared-components
Merge branch 'develop' of ssh://github.com/element-hq/element-web into t3chguy/element-web-monorepo
2026-02-11 10:02:33 +00:00