merge branch heads

2026-03-11 23:00:19 +01:00 · 2018-07-24 16:29:28 +02:00
parent 13c6b6f15c 7f088f54e7
commit 7bd7b70031
2 changed files with 2 additions and 2 deletions
--- a/scm-ui/package.json
+++ b/scm-ui/package.json
@@ -45,7 +45,7 @@
    "enzyme": "^3.3.0",
    "enzyme-adapter-react-16": "^1.1.1",
    "fetch-mock": "^6.5.0",
-    "flow-bin": "^0.75.0",
+    "flow-bin": "^0.77.0",
    "flow-typed": "^2.5.1",
    "jest-junit": "^5.1.0",
    "node-sass-chokidar": "^1.3.0",
--- a/scm-ui/src/users/types/User.js
+++ b/scm-ui/src/users/types/User.js
@@ -8,5 +8,5 @@ export type User = {
  password: string,
  admin: boolean,
  active: boolean,
-  _links?: Links
+  _links: Links
 };