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
..
AppGroup	[CHORE] App Group path as a iOS constant (#2439)	2020-08-31 17:29:44 -03:00
Crashlytics.framework	Crashlytics (#258)	2018-04-03 13:24:58 -03:00
Fabric.framework	Crashlytics (#258)	2018-04-03 13:24:58 -03:00
NotificationService	[NEW] E2E Encryption push (iOS) (#2463)	2020-09-24 15:34:13 -03:00
Pods	Merge branch 'develop' into single-server	2020-10-05 17:19:36 -03:00
RocketChatRN	Merge branch 'develop' into single-server	2020-10-05 17:19:36 -03:00
RocketChatRN.xcodeproj	Merge branch 'develop' into single-server	2020-10-05 17:19:36 -03:00
RocketChatRN.xcworkspace	Update all dependencies (#2008)	2020-05-08 13:37:49 -03:00
ShareRocketChatRN	[FIX] Remove assets from share extension on iOS (#2473)	2020-09-17 08:51:06 -03:00
Shared	[NEW] E2E Encryption push (iOS) (#2463)	2020-09-24 15:34:13 -03:00
fastlane	[FIX] Fastlane iOS (#2513)	2020-10-01 10:45:11 -03:00
Gemfile	[CHORE] Bugsnag logging setup (#1145)	2019-08-23 10:18:47 -03:00
Gemfile.lock	Update all dependencies (#2008)	2020-05-08 13:37:49 -03:00
LaunchScreen.storyboard	[CHORE] Use storyboard on splash screen (#1939)	2020-03-26 10:21:21 -03:00
Podfile	[NEW] E2E Encryption push (iOS) (#2463)	2020-09-24 15:34:13 -03:00
Podfile.lock	[NEW] E2E Encryption push (iOS) (#2463)	2020-09-24 15:34:13 -03:00
ReplyNotification.swift	[NEW] E2E Encryption push (iOS) (#2463)	2020-09-24 15:34:13 -03:00
RocketChatRN-Bridging-Header.h	[NEW] E2E Encryption push (iOS) (#2463)	2020-09-24 15:34:13 -03:00
Watermelon.swift	[CHORE] Migrate to Watermelon (#1171)	2019-09-16 17:26:32 -03:00
custom.ttf	[IMPROVEMENT] Customize Sign in with Apple button (#2420)	2020-08-21 16:22:29 -03:00