Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into production-xdai-stg
Browse files Browse the repository at this point in the history
  • Loading branch information
vbaranov committed Jun 8, 2023
2 parents aacfd7c + b57724c commit c17fc75
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Expand Up @@ -32,6 +32,7 @@

### Chore

- [#7666](https://github.com/blockscout/blockscout/pull/7666) - Search label query
- [#7644](https://github.com/blockscout/blockscout/pull/7644) - Publish docker images CI for prod/staging branches
- [#7594](https://github.com/blockscout/blockscout/pull/7594) - Stats service support in docker-compose config with new frontend
- [#7576](https://github.com/blockscout/blockscout/pull/7576) - Check left blocks in pending block operations in order to decide, if we need to display indexing int tx banner at the top
Expand Down
14 changes: 7 additions & 7 deletions apps/block_scout_web/assets/package-lock.json

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

2 changes: 1 addition & 1 deletion apps/block_scout_web/assets/package.json
Expand Up @@ -108,7 +108,7 @@
"sass": "^1.62.1",
"sass-loader": "^13.3.1",
"style-loader": "^3.3.3",
"webpack": "^5.85.1",
"webpack": "^5.86.0",
"webpack-cli": "^5.1.4"
},
"jest": {
Expand Down

0 comments on commit c17fc75

Please sign in to comment.