diff options
| author | ThibG <thib@sitedethib.com> | 2018-12-18 19:37:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-18 19:37:07 +0100 |
| commit | 74ee5bdf37799fba5990a6b492e3d52c32efe8d7 (patch) | |
| tree | afdeb6b23ff4d7bd5e53c4e13cb2c3dfafb4b986 /config/routes.rb | |
| parent | 36d27e289177fdec5332539c94b8192022a412f2 (diff) | |
| parent | 0ef2c1415a13d305d4c73c71f27a1366eee702a0 (diff) | |
Merge pull request #862 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/routes.rb')
| -rw-r--r-- | config/routes.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/config/routes.rb b/config/routes.rb index c0cfbf465..918c69cc2 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -81,9 +81,7 @@ Rails.application.routes.draw do post '/interact/:id', to: 'remote_interaction#create' get '/explore', to: 'directories#index', as: :explore - get '/explore/popular', to: 'directories#index', as: :explore_popular get '/explore/:id', to: 'directories#show', as: :explore_hashtag - get '/explore/:id/popular', to: 'directories#show', as: :explore_hashtag_popular namespace :settings do resource :profile, only: [:show, :update] |