projects / arvados-workbench2.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3915428 23c3b5d)
Merge branch 'master'
authorMichal Klobukowski <michal.klobukowski@contractors.roche.com>
Thu, 11 Oct 2018 13:20:49 +0000 (15:20 +0200)
committerMichal Klobukowski <michal.klobukowski@contractors.roche.com>
Thu, 11 Oct 2018 13:20:49 +0000 (15:20 +0200)
Feature #13862

Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski@contractors.roche.com>

1  2 
package.json patch | diff1 | diff2 | blob | history

diff --cc package.json
index 30ea7b9f12c2b43a553c36053f86592f12a29d5f,1d4a15b3e5e939a9d49b5f1e2fad9a9f07fe34f6..34e87afea018120d9b163e60bff334167baf42f9
--- 1/package.json
--- 2/package.json
+++ b/package.json
@@@ -30,8 -30,8 +30,9 @@@
      "react-splitter-layout": "3.0.1",
      "react-transition-group": "2.5.0",
      "redux": "4.0.0",
+     "redux-form": "7.4.2",
      "redux-thunk": "2.3.0",
 +    "reselect": "4.0.0",
      "shell-quote": "1.6.1",
      "unionize": "2.1.2",
      "uuid": "3.3.2"