Merge branch 'master' into ryscheng-bot-settings

oasislabs · Mar 1, 2019 · a159a74 · a159a74
2 parents 80eb5ee + 0871b64
commit a159a74
Show file tree

Hide file tree

Showing 4 changed files with 726 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -59,3 +59,6 @@ typings/
 
 # next.js build output
 .next
+
+# ephemeral testing resources
+test/integration/oasis-box/tmp/