Merge branch '2.0.0.rc' of github.com:locomotivecms/engine into 2.0.0.rc
This commit is contained in:
commit
9f7ac8630e
@ -99,10 +99,8 @@ Rails.application.routes.draw do
|
||||
match ':locale/*path/_edit' => 'locomotive/public/pages#edit', :locale => /(#{Locomotive.config.site_locales.join('|')})/
|
||||
match '*path/_edit' => 'locomotive/public/pages#edit'
|
||||
|
||||
match '/' => 'locomotive/public/pages#show'
|
||||
root :to => 'locomotive/public/pages#show'
|
||||
match ':locale' => 'locomotive/public/pages#show', :page_path => 'index', :locale => /(#{Locomotive.config.site_locales.join('|')})/
|
||||
match ':locale/*path' => 'locomotive/public/pages#show', :locale => /(#{Locomotive.config.site_locales.join('|')})/
|
||||
match '*path' => 'locomotive/public/pages#show'
|
||||
|
||||
|
||||
end
|
||||
end
|
||||
|
Loading…
Reference in New Issue
Block a user