Merge remote-tracking branch 'origin/develop' into develop

2018-05-09 10:50:48 +00:00 · 2018-05-09 10:50:48 +00:00 · 91b93921a9
parent 6fdd952510 a7f9f7ae3a
commit 91b93921a9
1 changed files with 1 additions and 1 deletions
--- a/package.json
+++ b/package.json
@ -74,7 +74,7 @@
    "isomorphic-fetch": "^2.2.1",
    "linkifyjs": "^2.1.3",
    "lodash": "^4.13.1",
-    "lolex": "^2.3.2",
+    "lolex": "2.3.2",
    "matrix-js-sdk": "0.10.1",
    "optimist": "^0.6.1",
    "pako": "^1.0.5",