Merge pull request DeviaVir#23 from RDash21/master

Fixed exchanges.json and reverted some of my suggestions... Double Check!
supersabbath · Aug 16, 2016 · 5f5f5d1 · 5f5f5d1
2 parents 191506e + 6dafdd0
commit 5f5f5d1
Show file tree

Hide file tree

Showing 2 changed files with 1,659 additions and 423 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,5 @@ npm-debug.log
 db.json
 dump
 conf/secret.json
+github.pub
+github