Merge branch 'modified_json_format' of github.com:Rulingcom/orbit into modified_json_format
Conflicts: vendor/built_in_modules/gallery/config/routes.rb
This commit is contained in:
commit
df58d4c5f3
|
@ -7,6 +7,7 @@ Rails.application.routes.draw do
|
||||||
match "upload_image" => "albums#upload_image"
|
match "upload_image" => "albums#upload_image"
|
||||||
match "save_tags" => "tags#save_tags"
|
match "save_tags" => "tags#save_tags"
|
||||||
match "albums/save_tags" => "tags#save_tags"
|
match "albums/save_tags" => "tags#save_tags"
|
||||||
|
|
||||||
resources :albums do
|
resources :albums do
|
||||||
match "set_cover" => "albums#set_cover"
|
match "set_cover" => "albums#set_cover"
|
||||||
match "imgs" => "albums#imgs"
|
match "imgs" => "albums#imgs"
|
||||||
|
|
Reference in New Issue