Merge branch 'master' into dev

This commit is contained in:
Danielv123 committed 2018-05-06 16:07:51 +02:00
commit f07b6160bb
3 files changed
+12 -9

No files matched your search

+1 -1
View File
@@ -23,7 +23,7 @@
"averaged-timeseries": "^1.4.0",
"bcryptjs": "^2.4.3",
"body-parser": "^1.18.2",
"codecov": "^2.3.1",
"codecov": "^3.0.1",
"compression": "^1.7.2",
"deepmerge": "^1.5.2",
"ejs": "^2.5.7",