From 47ecf8d30f4aa5e25a659fc7f3c0c1487420150e Mon Sep 17 00:00:00 2001
From: Sam Wilkins <abdullah_ahmed@brown.edu>
Date: Thu, 9 May 2019 20:59:10 -0400
Subject: merge with master, but haven't reconciled internal and external
 linking

---
 package.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index 2463afa74..943451c3b 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
         "webpack": "^4.29.6",
         "webpack-cli": "^3.2.3",
         "webpack-dev-middleware": "^3.6.1",
-        "webpack-dev-server": "^3.2.1",
+        "webpack-dev-server": "^3.3.1",
         "webpack-hot-middleware": "^2.24.3"
     },
     "dependencies": {
@@ -125,7 +125,7 @@
         "mobx-react-devtools": "^6.1.1",
         "mongodb": "^3.1.13",
         "mongoose": "^5.4.18",
-        "node-sass": "^4.11.0",
+        "node-sass": "^4.12.0",
         "nodemailer": "^5.1.1",
         "nodemon": "^1.18.10",
         "normalize.css": "^8.0.1",
@@ -163,6 +163,7 @@
         "react-table": "^6.9.2",
         "request": "^2.88.0",
         "request-promise": "^4.2.4",
+        "serializr": "^1.5.1",
         "socket.io": "^2.2.0",
         "socket.io-client": "^2.2.0",
         "typescript-collections": "^1.3.2",
-- 
cgit v1.2.3-70-g09d2