Diego Mello 6689ad969e Merge branch 'single-server' into 4.47.1-single-server ... # Conflicts: # android/app/build.gradle # app/i18n/locales/ar.json # app/i18n/locales/bn-IN.json # app/i18n/locales/de.json # app/i18n/locales/en.json # app/i18n/locales/es.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/ChangeAvatarView/index.tsx # ios/Podfile.lock # ios/RocketChatRN.xcodeproj/project.pbxproj # ios/RocketChatRN/Info.plist # ios/ShareRocketChatRN/Info.plist # package.json # scripts/organize-translations.js		2024-03-20 13:21:43 -03:00
..
actions	chore: Merge 4.47.0 into single-server (#5614)	2024-03-12 10:45:43 -03:00
containers	chore: Merge 4.47.0 into single-server (#5614)	2024-03-12 10:45:43 -03:00
definitions	chore: Merge 4.47.0 into single-server (#5614)	2024-03-12 10:45:43 -03:00
ee	[FIX] Remove nested room navigation (#4702)	2022-12-02 10:51:02 -03:00
i18n	chore: Merge 4.47.0 into single-server (#5614)	2024-03-12 10:45:43 -03:00
lib	chore: Merge 4.47.0 into single-server (#5614)	2024-03-12 10:45:43 -03:00
reducers	chore: Merge 4.47.0 into single-server (#5614)	2024-03-12 10:45:43 -03:00
sagas	chore: Merge 4.47.0 into single-server (#5614)	2024-03-12 10:45:43 -03:00
selectors	Merge 4.27.0 into single-server (#4138)	2022-04-28 15:44:40 -03:00
stacks	chore: Merge 4.47.0 into single-server (#5614)	2024-03-12 10:45:43 -03:00
static/images	Merge 4.14.0 into single-server (#2833)	2021-01-25 14:14:45 -03:00
views	Merge branch 'single-server' into 4.47.1-single-server	2024-03-20 13:21:43 -03:00
AppContainer.tsx	chore: Merge 4.47.0 into single-server (#5614)	2024-03-12 10:45:43 -03:00
ReactotronConfig.ts	Chore: Update Storybook libs to v6 (#4439)	2022-08-19 16:53:40 -03:00
dimensions.tsx	Chore: Deprecate Dimensions (#4597)	2022-12-02 10:51:02 -03:00
externalModules.d.ts	chore: Merge 4.47.0 into single-server (#5614)	2024-03-12 10:45:43 -03:00
index.tsx	chore: Merge 4.44.0 into single-server (#5409)	2023-12-18 14:35:15 -03:00
share.tsx	regression: Rollback to React Native 0.69.8 (#5162)	2023-08-18 14:48:33 -03:00
theme.tsx	Merge 4.28.0 into single-server (#4258)	2022-05-30 19:01:25 -03:00