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

2019-02-28 21:35:53 +01:00
parent 76ed481aa7 ee7d79c0ce
commit 2267eee356
22 changed files with 417 additions and 21 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@ -56,6 +56,7 @@ Rails.application.routes.draw do
      member do
        get :activity
        get :embed
+        get :replies
      end
    end