Merged branch master into password-reset

This commit is contained in:
Riley Davis
2016-11-15 12:34:43 -07:00
15 changed files with 253 additions and 94 deletions
+1
View File
@@ -57,6 +57,7 @@
"nodemailer": "^2.6.4",
"nodemailer-sendgrid-transport": "^0.2.0",
"prompt": "^1.0.0",
"react-mdl-selectfield": "^0.2.0",
"uuid": "^2.0.3"
},
"devDependencies": {