Skip to content

Commit

Permalink
Merge branch 'master' of github.com:OneKeyHQ/cross-inpage-provider in…
Browse files Browse the repository at this point in the history
…to fix/dapp-url

# Conflicts:
#	packages/core/package.json
#	packages/desktop/desktop-bridge-injected/package.json
#	packages/empty/package.json
#	packages/errors/package.json
#	packages/events/package.json
#	packages/example/package.json
#	packages/extension/extension-bridge-hosted/package.json
#	packages/extension/extension-bridge-injected/package.json
#	packages/injected/package.json
#	packages/native/native-bridge-injected/package.json
#	packages/providers/inpage-providers-hub/package.json
#	packages/providers/inpage-providers-hub/src/detectRiskWebsite/index.ts
#	packages/providers/onekey-algo-provider/package.json
#	packages/providers/onekey-alph-provider/package.json
#	packages/providers/onekey-aptos-provider/package.json
#	packages/providers/onekey-btc-provider/package.json
#	packages/providers/onekey-cardano-provider/package.json
#	packages/providers/onekey-conflux-provider/package.json
#	packages/providers/onekey-cosmos-provider/package.json
#	packages/providers/onekey-eth-provider/package.json
#	packages/providers/onekey-near-provider/package.json
#	packages/providers/onekey-nostr-provider/package.json
#	packages/providers/onekey-polkadot-provider/package.json
#	packages/providers/onekey-private-external-account-provider/package.json
#	packages/providers/onekey-private-provider/package.json
#	packages/providers/onekey-scdo-provider/package.json
#	packages/providers/onekey-solana-provider/package.json
#	packages/providers/onekey-sui-provider/package.json
#	packages/providers/onekey-ton-provider/package.json
#	packages/providers/onekey-tron-provider/package.json
#	packages/providers/onekey-webln-provider/package.json
#	packages/types/package.json
#	packages/webview/package.json
  • Loading branch information
originalix committed Sep 13, 2024
2 parents d2c2920 + 40fd9b6 commit 62823ad
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 62823ad

Please sign in to comment.