Skip to content

Commit

Permalink
Merge branch 'master' into dev
Browse files Browse the repository at this point in the history 
# Conflicts:
#	package.json
#	packages/chain-list-assets/package.json
#	packages/chain-list/package.json
#	packages/chain-list/src/data/AssetLogoMap.json
#	packages/chain-list/src/data/ChainLogoMap.json
#	packages/chain-list/src/packageInfo.ts
  • Loading branch information
@saltict
saltict committed Oct 6, 2023
2 parents f0c6907 + 35f686b commit 7d584f2
Show file tree
Hide file tree
Showing 3 changed files with 648 additions and 648 deletions.
Loading

0 comments on commit 7d584f2

Please sign in to comment.