Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

solving conflicts with yarn.lock (2) #835

Merged
merged 10 commits into from
Aug 20, 2024
Merged

Commits on Aug 13, 2024

  1. Merge pull request #776 from telosnetwork/dependabot/npm_and_yarn/bra…

    …ces-3.0.3
    
    Bump braces from 3.0.2 to 3.0.3
    pmjanus authored Aug 13, 2024
    Configuration menu
    Copy the full SHA
    9130d2b View commit details
    Browse the repository at this point in the history
  2. Bump socket.io-parser from 3.3.3 to 3.3.4

    Bumps [socket.io-parser](https://github.com/Automattic/socket.io-parser) from 3.3.3 to 3.3.4.
    - [Release notes](https://github.com/Automattic/socket.io-parser/releases)
    - [Changelog](https://github.com/socketio/socket.io-parser/blob/3.3.4/CHANGELOG.md)
    - [Commits](socketio/socket.io-parser@3.3.3...3.3.4)
    
    ---
    updated-dependencies:
    - dependency-name: socket.io-parser
      dependency-type: indirect
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Aug 13, 2024
    Configuration menu
    Copy the full SHA
    6405506 View commit details
    Browse the repository at this point in the history
  3. Bump @solana/web3.js from 1.87.1 to 1.95.2

    Bumps [@solana/web3.js](https://github.com/solana-labs/solana-web3.js) from 1.87.1 to 1.95.2.
    - [Release notes](https://github.com/solana-labs/solana-web3.js/releases)
    - [Commits](solana-labs/solana-web3.js@v1.87.1...v1.95.2)
    
    ---
    updated-dependencies:
    - dependency-name: "@solana/web3.js"
      dependency-type: indirect
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Aug 13, 2024
    Configuration menu
    Copy the full SHA
    97d2aee View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2024

  1. Merge pull request #823 from telosnetwork/dependabot/npm_and_yarn/sol…

    …ana/web3.js-1.95.2
    
    Bump @solana/web3.js from 1.87.1 to 1.95.2
    pmjanus authored Aug 16, 2024
    Configuration menu
    Copy the full SHA
    ae90686 View commit details
    Browse the repository at this point in the history
  2. Bump axios from 1.6.0 to 1.7.4

    Bumps [axios](https://github.com/axios/axios) from 1.6.0 to 1.7.4.
    - [Release notes](https://github.com/axios/axios/releases)
    - [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
    - [Commits](axios/axios@v1.6.0...v1.7.4)
    
    ---
    updated-dependencies:
    - dependency-name: axios
      dependency-type: direct:production
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Aug 16, 2024
    Configuration menu
    Copy the full SHA
    6e63583 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #822 from telosnetwork/dependabot/npm_and_yarn/soc…

    …ket.io-parser-3.3.4
    
    Bump socket.io-parser from 3.3.3 to 3.3.4
    pmjanus authored Aug 16, 2024
    Configuration menu
    Copy the full SHA
    300ed98 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #831 from telosnetwork/dependabot/npm_and_yarn/axi…

    …os-1.7.4
    
    Bump axios from 1.6.0 to 1.7.4
    pmjanus authored Aug 16, 2024
    Configuration menu
    Copy the full SHA
    c0babfa View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2024

  1. solving conflicts (2)

    Viterbo committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    948e051 View commit details
    Browse the repository at this point in the history
  2. solving conflicts (3)

    Viterbo committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    f1498ab View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    4313634 View commit details
    Browse the repository at this point in the history