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

2018-10-08 13:51:33 +02:00
parent 96c3d26870 4c4ff05a46
commit d17844e6d1
58 changed files with 875 additions and 106 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@ -267,6 +267,7 @@ Rails.application.routes.draw do
      resources :streaming, only: [:index]
      resources :custom_emojis, only: [:index]
      resources :suggestions, only: [:index, :destroy]
+      resources :conversations, only: [:index]

      get '/search', to: 'search#index', as: :search