Merge pull request #961 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

1 files changed, 2 insertions, 2 deletions

diff --git a/config/routes.rb b/config/routes.rb
index 7a7d0bc01..d521d66ca 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -107,8 +107,6 @@ Rails.application.routes.draw do
       resource :confirmation, only: [:new, :create]
     end
 
-    resource :follower_domains, only: [:show, :update]
-
     resources :applications, except: [:edit] do
       member do
         post :regenerate
@@ -132,6 +130,7 @@ Rails.application.routes.draw do
   resources :emojis, only: [:show]
   resources :invites, only: [:index, :create, :destroy]
   resources :filters, except: [:show]
+  resource :relationships, only: [:show, :update]
 
   get '/public', to: 'public_timelines#show', as: :public_timeline
   get '/media_proxy/:id/(*any)', to: 'media_proxy#show', as: :media_proxy
@@ -292,6 +291,7 @@ Rails.application.routes.draw do
       resources :custom_emojis, only: [:index]
       resources :suggestions, only: [:index, :destroy]
       resources :scheduled_statuses, only: [:index, :show, :update, :destroy]
+      resources :preferences, only: [:index]
 
       resources :conversations, only: [:index, :destroy] do
         member do