Merge branch 'master' into feat/barcode-item-scan

FACN1 · May 7, 2017 · d136df1 · d136df1
2 parents bcb845f + 071491a
commit d136df1
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
-node_modules
+node_modules/
 config.env
 .eslintcache
 googleapikey.json
 designs/sample-card.psd
+keys/