fixes #1289

2014-03-18 11:21:10 -07:00
parent 97dcfa3d2a
commit de34d21f76
6 changed files with 56 additions and 0 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -113,6 +113,8 @@ Danbooru::Application.routes.draw do
  resources :forum_topics do
    member do
      post :undelete
+      get :new_merge
+      post :create_merge
    end
    collection do
      post :mark_all_as_read