Commit 3ff2bc7c authored by Emily Jensen's avatar Emily Jensen

Merge from dev

parents 4658957e 60c278b7
......@@ -88,7 +88,7 @@
"raven-js": "^3.27.0",
"reflect-metadata": "~0.1.8",
"rxjs": "^6.3.3",
"rxjs-tslint": "^0.1.5",
"rxjs-tslint": "0.1.5",
"stream": "^0.0.2",
"susy": "^2.2.12",
"text-encoding-utf-8": "^1.0.2",
......@@ -139,4 +139,4 @@
"version": "5.0.0"
}
}
}
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment