Merge pull request #36 from plugblockchain/merge/upstream

Merge/upstream
plugblockchain · Dec 11, 2019 · 0966e9d · 0966e9d
2 parents 36e1eef + b1ae254
commit 0966e9d
Show file tree

Hide file tree

Showing 554 changed files with 13,293 additions and 7,491 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,14 +2,11 @@
 **/*.rs.bk
 *.swp
 .wasm-binaries
-polkadot/runtime/wasm/target/
-core/executor/wasm/target/
-core/test-runtime/wasm/target/
 pwasm-alloc/target/
 pwasm-libc/target/
 pwasm-alloc/Cargo.lock
 pwasm-libc/Cargo.lock
-node/runtime/wasm/target/
+bin/node/runtime/wasm/target/
 **/._*
 **/.criterion/
 .vscode