X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/b77abbed6a747e46b98b1e8478158b27ff320151..99240b3ebe6affa2087b7c320970bdb46c4594fd:/services/api/config/routes.rb?ds=sidebyside

diff --git a/services/api/config/routes.rb b/services/api/config/routes.rb
index ad2406ae45..b54c3c5bf1 100644
--- a/services/api/config/routes.rb
+++ b/services/api/config/routes.rb
@@ -30,6 +30,7 @@ Server::Application.routes.draw do
       resources :groups do
         get 'contents', on: :collection
         get 'contents', on: :member
+        get 'shared', on: :collection
         post 'trash', on: :member
         post 'untrash', on: :member
       end
@@ -81,6 +82,7 @@ Server::Application.routes.draw do
         post 'setup', on: :collection
         post 'unsetup', on: :member
         post 'update_uuid', on: :member
+        post 'merge', on: :collection
       end
       resources :virtual_machines do
         get 'logins', on: :member