Merge branch 'master' of https://github.com/solana-labs/example-webwa…

…llet into develop # Conflicts: # src/wallet.js
solana-labs · Sep 10, 2019 · cde6144 · cde6144
2 parents acd1538 + 9b6b9a4
commit cde6144
Show file tree

Hide file tree

Showing 13 changed files with 871 additions and 310 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 /node_modules
 /dist/*bundle.js
 /dist/*worker.js
+/dist/main.css
 *.sw[po]
 /store
 .idea
diff --git a/dist/main.css b/dist/main.css