Diego Mello 5e633e550e Merge branch 'develop' into single-server ... # Conflicts: # android/app/build.gradle # android/app/src/play/google-services.json # app/lib/database/index.js # app/sagas/init.js # app/sagas/login.js # ios/Pods/Manifest.lock # ios/Pods/Pods.xcodeproj/project.pbxproj # ios/Pods/Target Support Files/MMKV/MMKV-prefix.pch # ios/Pods/Target Support Files/MMKV/MMKV.debug.xcconfig # ios/Pods/Target Support Files/MMKV/MMKV.release.xcconfig # ios/Pods/Target Support Files/MMKVCore/MMKVCore.debug.xcconfig # ios/Pods/Target Support Files/MMKVCore/MMKVCore.release.xcconfig # ios/Pods/Target Support Files/Pods-RocketChatRN/Pods-RocketChatRN-acknowledgements.markdown # ios/Pods/Target Support Files/Pods-RocketChatRN/Pods-RocketChatRN-acknowledgements.plist # ios/Pods/Target Support Files/Pods-RocketChatRN/Pods-RocketChatRN.debug.xcconfig # ios/Pods/Target Support Files/Pods-RocketChatRN/Pods-RocketChatRN.release.xcconfig # ios/Pods/Target Support Files/Pods-ShareRocketChatRN/Pods-ShareRocketChatRN-acknowledgements.markdown # ios/Pods/Target Support Files/Pods-ShareRocketChatRN/Pods-ShareRocketChatRN-acknowledgements.plist # ios/Pods/Target Support Files/Pods-ShareRocketChatRN/Pods-ShareRocketChatRN.debug.xcconfig # ios/Pods/Target Support Files/Pods-ShareRocketChatRN/Pods-ShareRocketChatRN.release.xcconfig # ios/Pods/Target Support Files/RNConfigReader/RNConfigReader.debug.xcconfig # ios/Pods/Target Support Files/RNConfigReader/RNConfigReader.release.xcconfig # ios/Pods/Target Support Files/react-native-cookies/react-native-cookies.debug.xcconfig # ios/Pods/Target Support Files/react-native-simple-crypto/react-native-simple-crypto.debug.xcconfig # ios/RocketChatRN.xcodeproj/project.pbxproj		2020-10-05 17:19:36 -03:00
..
app	Merge branch 'develop' into single-server	2020-10-05 17:19:36 -03:00
fastlane	[FIX] Upload to internal looking for the wrong path after #2171 (#2432)	2020-08-26 16:24:35 -03:00
gradle/wrapper	[CHORE] Only run Flipper in debug via MainApplication is debug (#2347)	2020-07-30 09:18:48 -03:00
Gemfile	[NEW] Add fastlane to android module and configure CI (#2100)	2020-06-16 10:31:07 -03:00
Gemfile.lock	[NEW] Add to F-Droid (#2171)	2020-08-24 09:24:10 -03:00
build.gradle	[NEW] Add to F-Droid (#2171)	2020-08-24 09:24:10 -03:00
gradle.properties	Merge branch 'develop' into single-server	2020-10-05 17:19:36 -03:00
gradlew	Update dependencies (#2301)	2020-07-20 13:35:17 -03:00
gradlew.bat	Update dependencies (#2301)	2020-07-20 13:35:17 -03:00
settings.gradle	[REVERT] Show emoji keyboard on Android (#1738)	2020-02-17 09:14:56 -03:00