Merge branch 'modified_json_format' of github.com:Rulingcom/orbit into modified_json_format

Conflicts: vendor/built_in_modules/gallery/config/routes.rb
2012-11-20 12:14:53 +08:00 · 2012-11-20 12:14:53 +08:00 · df58d4c5f3
parent bb63e68ee7 e7b675c91e
commit df58d4c5f3
1 changed files with 1 additions and 0 deletions
--- a/vendor/built_in_modules/gallery/config/routes.rb
+++ b/vendor/built_in_modules/gallery/config/routes.rb
@ -7,6 +7,7 @@ Rails.application.routes.draw do
      	match "upload_image" => "albums#upload_image"
      	match "save_tags" => "tags#save_tags"
      	match "albums/save_tags" => "tags#save_tags"
+        
       	resources :albums do 
      		match "set_cover" => "albums#set_cover"
      		match "imgs" => "albums#imgs"