Skip to content

Commit

Permalink
Merge remote-tracking branch 'zano_ui/main' into testnet/issues
Browse files Browse the repository at this point in the history
# Conflicts:
#	html/main.js.map
#	html/polyfills.js
#	html/polyfills.js.map
  • Loading branch information
Nazar Usov authored and Nazar Usov committed Nov 24, 2023
2 parents 3492c19 + ea512b0 commit 1a43f59
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion html/main.js.map

Large diffs are not rendered by default.

7 changes: 3 additions & 4 deletions html/polyfills.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion html/polyfills.js.map

Large diffs are not rendered by default.

0 comments on commit 1a43f59

Please sign in to comment.