Merge branch 'feature/imkey_core_integration' into feat_tezos

luofj8 · Dec 29, 2020 · eca1ebb · eca1ebb
2 parents 28fa5ef + 97afa9d
commit eca1ebb
Show file tree

Hide file tree

Showing 2 changed files with 3,907 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,5 @@
 **/target/
 
-**/Cargo.lock
 
 **/*.rs.bk