Merge branch 'dev' of github.com:matter-labs/zksync-dev into fk/promo…

…te-ropsten
SanGanz · Apr 23, 2020 · 0326310 · 0326310
2 parents 5a0616b + ac08894
commit 0326310
Show file tree

Hide file tree

Showing 122 changed files with 3,048 additions and 1,818 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -1,5 +1,6 @@
 *
 !target/x86_64-unknown-linux-musl/release/server
+!target/x86_64-unknown-linux-musl/release/server_supervisor
 !target/x86_64-unknown-linux-musl/release/prover
 !docker/prover/prover-entry.sh
 !docker/nginx/nginx.conf