Diego Mello
|
9e89b57b03
|
Merge branch 'develop' into feat.block-room-content-e2ee
# Conflicts:
# __tests__/containers/RoomHeader/__snapshots__/RoomHeader.stories.storyshot
# app/i18n/locales/ar.json
# app/i18n/locales/bn-IN.json
# app/i18n/locales/de.json
# app/i18n/locales/en.json
# app/i18n/locales/fi.json
# app/i18n/locales/fr.json
# app/i18n/locales/hi-IN.json
# app/i18n/locales/hu.json
# app/i18n/locales/it.json
# app/i18n/locales/ja.json
# app/i18n/locales/nl.json
# app/i18n/locales/pt-BR.json
# app/i18n/locales/pt-PT.json
# app/i18n/locales/ru.json
# app/i18n/locales/sl-SI.json
# app/i18n/locales/sv.json
# app/i18n/locales/ta-IN.json
# app/i18n/locales/te-IN.json
# app/i18n/locales/tr.json
# app/i18n/locales/zh-CN.json
# app/i18n/locales/zh-TW.json
# app/views/E2EEnterYourPasswordView.tsx
# app/views/RoomView/index.tsx
|
2024-04-19 16:59:22 -03:00 |