Skip to content
  • jbuechele's avatar
    Merge branch 'develop' into v2.5.0 · 766a4d0d
    jbuechele authored
    # Conflicts:
    #	android/app/build.gradle
    #	ios/Podfile.lock
    #	ios/Pods/Local Podspecs/EXVideoThumbnails.podspec.json
    #	ios/Pods/Manifest.lock
    #	ios/Pods/Pods.xcodeproj/project.pbxproj
    #	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-resources.sh
    #	ios/Pods/Target Support Files/Pods-ShareRocketChatRN/Pods-ShareRocketChatRN.debug.xcconfig
    #	ios/Pods/Target Support Files/Pods-ShareRocketChatRN/Pods-ShareRocketChatRN.release.xcconfig
    #	ios/RocketChatRN.xcodeproj/project.pbxproj
    #	ios/RocketChatRN/Info.plist
    #	ios/ShareRocketChatRN/Info.plist
    766a4d0d