Merge commit 'b9f59ebcc68e9da0a7158741a1a2ef3564e1321e' into merging-upstream

2017-09-28 09:18:35 +02:00
parent fcf0d2078e b9f59ebcc6
commit 83bda6c1a8
4750 changed files with 5257 additions and 3475 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@ -188,6 +188,7 @@ Rails.application.routes.draw do
      end

      resources :streaming, only: [:index]
+      resources :custom_emojis, only: [:index]

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