Merge remote-tracking branch 'upstream/master' into merge-glitch

1 files changed, 2 insertions, 2 deletions

diff --git a/config/routes.rb b/config/routes.rb
index 9a862517a..13b744bf8 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -249,7 +249,7 @@ Rails.application.routes.draw do
 
     resources :report_notes, only: [:create, :destroy]
 
-    resources :accounts, only: [:index, :show] do
+    resources :accounts, only: [:index, :show, :destroy] do
       member do
         post :enable
         post :unsilence
@@ -490,7 +490,7 @@ Rails.application.routes.draw do
       end
 
       namespace :admin do
-        resources :accounts, only: [:index, :show] do
+        resources :accounts, only: [:index, :show, :destroy] do
           member do
             post :enable
             post :unsilence