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
..
CocoaAsyncSocket	Update all dependencies (#2008)	2020-05-08 13:37:49 -03:00
CocoaLibEvent	Update all dependencies (#2008)	2020-05-08 13:37:49 -03:00
DoubleConversion	Update RN to 0.59.8 (#896)	2019-05-22 17:15:35 -03:00
Firebase	[CHORE] Update react-native-firebase (#2336)	2020-07-24 10:19:17 -03:00
FirebaseAnalytics/Frameworks	Remove pods	2020-08-10 14:41:39 -03:00
FirebaseCore	[NEW] Encrypt user credentials and preferences (#2247)	2020-08-19 14:14:22 -03:00
FirebaseCoreDiagnostics	Remove pods	2020-08-10 14:41:39 -03:00
FirebaseCrashlytics	[CHORE] Update react-native-firebase (#2336)	2020-07-24 10:19:17 -03:00
FirebaseInstallations	Update dependencies (#2301)	2020-07-20 13:35:17 -03:00
Flipper	Update dependencies (#2301)	2020-07-20 13:35:17 -03:00
Flipper-DoubleConversion	Update all dependencies (#2008)	2020-05-08 13:37:49 -03:00
Flipper-Folly	Update all dependencies (#2008)	2020-05-08 13:37:49 -03:00
Flipper-Glog	Update all dependencies (#2008)	2020-05-08 13:37:49 -03:00
Flipper-PeerTalk	Update all dependencies (#2008)	2020-05-08 13:37:49 -03:00
Flipper-RSocket	Update all dependencies (#2008)	2020-05-08 13:37:49 -03:00
FlipperKit	Update dependencies (#2301)	2020-07-20 13:35:17 -03:00
Folly	Update dependencies (#2301)	2020-07-20 13:35:17 -03:00
GoogleAppMeasurement/Frameworks/GoogleAppMeasurement.framework	Remove pods	2020-08-10 14:41:39 -03:00
GoogleDataTransport	[CHORE] Update react-native-firebase (#2336)	2020-07-24 10:19:17 -03:00
GoogleDataTransportCCTSupport	[CHORE] Update react-native-firebase (#2336)	2020-07-24 10:19:17 -03:00
GoogleUtilities	Update dependencies (#2301)	2020-07-20 13:35:17 -03:00
Headers	[NEW] E2E Encryption push (iOS) (#2463)	2020-09-24 15:34:13 -03:00
JitsiMeetSDK	Update dependencies (#2301)	2020-07-20 13:35:17 -03:00
Local Podspecs	[NEW] E2E Encryption push (iOS) (#2463)	2020-09-24 15:34:13 -03:00
MMKV	[NEW] Encrypt user credentials and preferences (#2247)	2020-08-19 14:14:22 -03:00
MMKVCore	[NEW] Encrypt user credentials and preferences (#2247)	2020-08-19 14:14:22 -03:00
OpenSSL-Universal	Update all dependencies (#2008)	2020-05-08 13:37:49 -03:00
Pods.xcodeproj	[NEW] E2E Encryption push (iOS) (#2463)	2020-09-24 15:34:13 -03:00
PromisesObjC	Update dependencies (#2301)	2020-07-20 13:35:17 -03:00
SDWebImage	Update dependencies (#2301)	2020-07-20 13:35:17 -03:00
SDWebImageWebPCoder	Update all dependencies (#2008)	2020-05-08 13:37:49 -03:00
TOCropViewController	Update dependencies (#2301)	2020-07-20 13:35:17 -03:00
Target Support Files	Merge branch 'develop' into single-server	2020-10-05 17:19:36 -03:00
YogaKit	Update all dependencies (#2008)	2020-05-08 13:37:49 -03:00
boost-for-react-native	Update RN to 0.59.8 (#896)	2019-05-22 17:15:35 -03:00
glog	Update RN to 0.59.8 (#896)	2019-05-22 17:15:35 -03:00
libwebp	[CHORE] Memory leaks investigation (#1675)	2020-02-17 16:06:18 -03:00
nanopb	Update all dependencies (#2008)	2020-05-08 13:37:49 -03:00
Manifest.lock	[NEW] E2E Encryption push (iOS) (#2463)	2020-09-24 15:34:13 -03:00