Merge branch 'master' into feat/server-session-token

FACN1 · May 8, 2017 · 0cf63ea · 0cf63ea
2 parents 4f2f32f + 071491a
commit 0cf63ea
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,7 @@
-node_modules
+node_modules/
 config.env
 .eslintcache
 googleapikey.json
 designs/sample-card.psd
+feat/server-session-token
+keys/