diff options
author | Claire <claire.github-309c@sitedethib.com> | 2023-03-16 23:09:53 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-03-16 23:09:53 +0100 |
commit | f5daa20f2a90098c9d689c5ec9d95ce9887b3a33 (patch) | |
tree | a225407cb43edf3fa9d9ac0100021a380e11ff91 /config/routes.rb | |
parent | 6a0ed45aa3f11f0343a7be556b36b4d075ba08df (diff) | |
parent | 32418f0ff3e7f25ca67334585d6d8442b34cb4af (diff) |
Merge pull request #2134 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/routes.rb')
-rw-r--r-- | config/routes.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/config/routes.rb b/config/routes.rb index 37d8dcd2e..8d3183263 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -477,7 +477,9 @@ Rails.application.routes.draw do resources :list, only: :show end - resources :streaming, only: [:index] + get '/streaming', to: 'streaming#index' + get '/streaming/(*any)', to: 'streaming#index' + resources :custom_emojis, only: [:index] resources :suggestions, only: [:index, :destroy] resources :scheduled_statuses, only: [:index, :show, :update, :destroy] |