Merge branch 'Acadia' of https://github.com/zelcash/zelcash into Acadia

RunOnFlux · Dec 13, 2018 · 70a7c34 · 70a7c34
2 parents 2052084 + 1a76242
commit 70a7c34
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -431,3 +431,4 @@ ASALocalRun/
 .vscode/tasks.json
 .vscode/launch.json
 .vscode/extensions.json
+.DS_Store