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 |