diegolmello
|
ca93e333ad
|
Merge branch 'develop' into update-rn-60-2
# Conflicts:
# app/views/ShareListView/index.js
# ios/Podfile
# ios/Podfile.lock
# ios/Pods/Manifest.lock
# ios/Pods/Pods.xcodeproj/project.pbxproj
# 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.debug.xcconfig
# ios/Pods/Target Support Files/Pods-ShareRocketChatRN/Pods-ShareRocketChatRN.release.xcconfig
# ios/Pods/Target Support Files/react-native-realm-path/react-native-realm-path.xcconfig
# ios/Pods/Target Support Files/rn-extensions-share/rn-extensions-share.xcconfig
# ios/RocketChatRN.xcodeproj/project.pbxproj
# package.json
|
2019-08-01 18:05:09 -03:00 |