Merge branch 'master' of github.com:r888888888/danbooru

This commit is contained in:
r888888888
2013-06-05 10:33:23 -07:00
12 changed files with 88 additions and 36 deletions

View File

@@ -61,6 +61,7 @@ Danbooru::Application.routes.draw do
put :ban
get :edit_name
put :update_name
post :undelete
end
collection do
get :show_or_new