Merged
Conversation
|
What is the plan for for this? |
Member
Author
@ozeksi I halted this development in favor of PIN/biometric unlock for now. |
Closed
# Conflicts: # __tests__/__snapshots__/Storyshots.test.js.snap # ios/Pods/Pods.xcodeproj/project.pbxproj # 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/react-native-video/react-native-video.xcconfig # package.json
diegolmello
force-pushed
the
update-deps
branch
2 times, most recently
from
a71b8a9 to
1bad3d4
Compare
# Conflicts: # android/app/src/main/java/chat/rocket/reactnative/generated/BasePackageList.java # ios/Podfile.lock # ios/Pods/Manifest.lock # ios/Pods/Pods.xcodeproj/project.pbxproj # ios/Pods/Target Support Files/EXKeepAwake/EXKeepAwake-prefix.pch # ios/Pods/Target Support Files/EXKeepAwake/EXKeepAwake.xcconfig # ios/Pods/Target Support Files/Flipper-DoubleConversion/Flipper-DoubleConversion-prefix.pch # ios/Pods/Target Support Files/Flipper-PeerTalk/Flipper-PeerTalk.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/SocketRocket/SocketRocket-prefix.pch # ios/Pods/Target Support Files/SocketRocket/SocketRocket.xcconfig # package.json # yarn.lock
@RocketChat/ReactNative