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

…ecouple-key-from-env-file
drifterag · Apr 23, 2020 · baea3af · baea3af
2 parents 61da59e + b2623c8
commit baea3af
Show file tree

Hide file tree

Showing 51 changed files with 1,753 additions and 402 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