Merge branch 'master' of github.com:superskyy/food_ordering

jgrimshaw · May 24, 2019 · 9a32340 · 9a32340
2 parents 5438664 + 0211929
commit 9a32340
Show file tree

Hide file tree

Showing 17 changed files with 475 additions and 16 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,6 @@
 
 .DS_Store
-
+ngrok
 
 node_modules/
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -20,7 +20,8 @@
     "knex-logger": "^0.1.0",
     "morgan": "^1.7.0",
     "node-sass-middleware": "^0.9.8",
-    "pg": "^6.0.2"
+    "pg": "^6.0.2",
+    "twilio": "^3.31.0"
   },
   "devDependencies": {
     "nodemon": "^1.9.2"