Merge branch 'dev' into ci_all_runners

0xmountaintop · Jan 13, 2021 · 7629619 · 7629619
2 parents 5d0481b + 1aef2e2
commit 7629619
Show file tree

Hide file tree

Showing 27 changed files with 524 additions and 1,930 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -20,6 +20,5 @@
 !infrastructure/explorer/index.html
 !infrastructure/explorer/dist
 !infrastructure/fee-seller
-!infrastructure/tok_cli
 !infrastructure/zk
 !sdk/zksync-rs