raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-14 23:47:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into laura_and_will

Browse Source 
Conflicts:
	app/assets/javascripts/templates/partials/enterprise_header.html.haml
	app/views/shopping_shared/_contact.html.haml
	spec/features/consumer/home_spec.rb
This commit is contained in:
Will Marshall
2014-06-24 17:16:22 +10:00
parent 4f3d468db6 64cca8cf36
commit edd9d93b8c
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
config/routes.rb
View File

@@ -3,11 +3,7 @@ Openfoodnetwork::Application.routes.draw do
get "/#/login", to: "home#index", as: :spree_login
if Rails.env.production?
get "/map", to: "home#index", as: :map
else
get "/map", to: "map#index", as: :map
end
get "/map", to: "map#index", as: :map
resource :shop, controller: "shop" do
get :products