saurabh
/
orbit-basic
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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:
chris 2012-11-20 12:14:53 +08:00
parent bb63e68ee7 e7b675c91e
commit df58d4c5f3
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
vendor/built_in_modules/gallery/config/routes.rb vendored
View File

@ -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"