merge conflicts
authorPawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Mon, 23 Jul 2018 12:14:16 +0000 (14:14 +0200)
committerPawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Mon, 23 Jul 2018 12:14:16 +0000 (14:14 +0200)
commit10ce16c28de952f6533ca3cc9df909269e3d2a53
treede95a68de2f4ffc2d6fd67e0fa1be74da3a0ae72
parentb0de143e088973715681f7eb6c41f2dccb648c2b
parent7df4149100f41cc8d4a5438630ba95a1d72409a1
merge conflicts

Feature #13781

Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
package.json
src/common/api/common-resource-service.ts
src/store/project/project-action.ts
src/store/project/project-reducer.ts
src/store/store.ts
src/views-components/create-project-dialog/create-project-dialog.tsx
src/views-components/dialog-create/dialog-project-create.tsx
src/views/workbench/workbench.tsx
yarn.lock