Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `config/routes.rb`:
  Upstream disabled E2EE routes, which we did earlier, but slightly
  differently. Took upstream's version.

1 files changed, 16 insertions, 16 deletions

diff --git a/config/routes.rb b/config/routes.rb
index 626e4688c..ac6323e6e 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -343,22 +343,22 @@ Rails.application.routes.draw do
         end
       end
 
-#      namespace :crypto do
-#        resources :deliveries, only: :create
-#
-#        namespace :keys do
-#          resource :upload, only: [:create]
-#          resource :query,  only: [:create]
-#          resource :claim,  only: [:create]
-#          resource :count,  only: [:show]
-#        end
-#
-#        resources :encrypted_messages, only: [:index] do
-#          collection do
-#            post :clear
-#          end
-#        end
-#      end
+      # namespace :crypto do
+      #   resources :deliveries, only: :create
+
+      #   namespace :keys do
+      #     resource :upload, only: [:create]
+      #     resource :query,  only: [:create]
+      #     resource :claim,  only: [:create]
+      #     resource :count,  only: [:show]
+      #   end
+
+      #   resources :encrypted_messages, only: [:index] do
+      #     collection do
+      #       post :clear
+      #     end
+      #   end
+      # end
 
       resources :conversations, only: [:index, :destroy] do
         member do