Diego Mello 88ec8ef1d6 Merge branch 'master' into 4.37.0-master ... # Conflicts: # __tests__/containers/markdown/new/__snapshots__/NewMarkdown.stories.storyshot # __tests__/containers/message/__snapshots__/Message.stories.storyshot # android/app/build.gradle # app/i18n/locales/en.json # app/i18n/locales/pt-BR.json # ios/RocketChatRN.xcodeproj/project.pbxproj # ios/RocketChatRN/Info.plist # ios/ShareRocketChatRN/Info.plist # package.json		2023-04-11 17:11:37 -03:00
..
xcshareddata/xcschemes	Chore: Upgrade React Native to 0.68.2 (#4316)	2022-08-08 18:02:08 -03:00
project.pbxproj	Merge branch 'master' into 4.37.0-master	2023-04-11 17:11:37 -03:00