Merge branch 'master' of github.com:jorilallo/atlas into update-slate

2017-12-08 20:22:07 -08:00
parent 466986eabb 1832bc74ad
commit 13b1ab7dca
24 changed files with 289 additions and 151 deletions
--- a/package.json
+++ b/package.json
@@ -154,6 +154,7 @@
    "react-modal": "^3.1.2",
    "react-portal": "^4.0.0",
    "react-router-dom": "^4.2.0",
+    "react-waypoint": "^7.3.1",
    "redis": "^2.6.2",
    "redis-lock": "^0.1.0",
    "rimraf": "^2.5.4",