Merge branch 'dev' into pr/71

This commit is contained in:
Danielv123 committed 2018-04-11 15:22:42 +02:00
commit 51e41835ee
7 files changed
+141 -12

No files matched your search

+2
View File
@@ -21,6 +21,7 @@
"app-root-path": "^2.0.1",
"as-table": "^1.0.31",
"averaged-timeseries": "^1.4.0",
"bcryptjs": "^2.4.3",
"body-parser": "^1.18.2",
"codecov": "^2.3.1",
"deepmerge": "^1.5.2",
@@ -33,6 +34,7 @@
"hash-files": "^1.1.1",
"html5-validator": "^1.0.7",
"ini": "^1.3.5",
"jsonwebtoken": "^8.2.1",
"leveldown": "^1.9.0",
"linvodb3": "^3.25.1",
"luamin": "^1.0.4",