Merge branch 'master' into 13540-add-possibility-to-open-files-in-third-party-apps
authorMichal Klobukowski <michal.klobukowski@contractors.roche.com>
Mon, 17 Dec 2018 16:10:26 +0000 (17:10 +0100)
committerMichal Klobukowski <michal.klobukowski@contractors.roche.com>
Mon, 17 Dec 2018 16:10:26 +0000 (17:10 +0100)
refs #13540

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

1  2 
src/index.tsx

diff --cc src/index.tsx
index 55d0b482f8c1e170a21f0845d1ea1afc07bfc48d,508fa7c3dad5cb140246352cb821b56c98d49d7a..7cd4ae9ab45dfc37e8b8bdc9690318ba393fc530
@@@ -56,8 -56,9 +56,10 @@@ import { virtualMachineActionSet } fro
  import { userActionSet } from '~/views-components/context-menu/action-sets/user-action-set';
  import { computeNodeActionSet } from '~/views-components/context-menu/action-sets/compute-node-action-set';
  import { apiClientAuthorizationActionSet } from '~/views-components/context-menu/action-sets/api-client-authorization-action-set';
+ import { groupActionSet } from '~/views-components/context-menu/action-sets/group-action-set';
+ import { groupMemberActionSet } from '~/views-components/context-menu/action-sets/group-member-action-set';
  import { linkActionSet } from '~/views-components/context-menu/action-sets/link-action-set';
 +import { loadFileViewersConfig } from '~/store/file-viewers/file-viewers-actions';
  
  console.log(`Starting arvados [${getBuildInfo()}]`);