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
..
app	Merge branch 'single-server' into 4.47.1-single-server	2024-03-20 13:21:43 -03:00
fastlane	Merge 4.19.0 into single-server (#3360)	2021-08-31 17:35:31 -03:00
gradle/wrapper	regression: Rollback to React Native 0.69.8 (#5162)	2023-08-18 14:48:33 -03:00
Gemfile	[NEW] Add fastlane to android module and configure CI (#2100)	2020-06-16 10:31:07 -03:00
Gemfile.lock	chore: Merge 4.47.0 into single-server (#5614)	2024-03-12 10:45:43 -03:00
build.gradle	regression: Rollback to React Native 0.69.8 (#5162)	2023-08-18 14:48:33 -03:00
gradle.properties	regression: Rollback to React Native 0.69.8 (#5162)	2023-08-18 14:48:33 -03:00
gradlew	Chore: Upgrade React Native to 0.68.2 (#4316)	2022-08-08 18:02:08 -03:00
gradlew.bat	Merge 4.19.0 into single-server (#3360)	2021-08-31 17:35:31 -03:00
settings.gradle	regression: Rollback to React Native 0.69.8 (#5162)	2023-08-18 14:48:33 -03:00