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
..
colors.js	[IMPROVEMENT] Apply new mention colors (#2351)	2020-07-29 17:49:08 -03:00
environment.js	[NEW] Add to F-Droid (#2171)	2020-08-24 09:24:10 -03:00
links.js	Merge branch 'develop' into single-server	2020-10-05 17:19:36 -03:00
localAuthentication.js	[FIX] Screen Lock options i18n (#2120)	2020-05-18 14:35:21 -03:00
messagesStatus.js	Delete/resend message (#136)	2017-12-13 13:00:26 -02:00
settings.js	[IMPROVEMENT] Add "Allow_Save_Media_to_Gallery" setting (#2459)	2020-09-15 10:34:49 -03:00
tablet.js	[CHORE] Update react-navigation to v5 (#2154)	2020-06-15 11:00:46 -03:00