Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

Merge remote-tracking branch 'fsmanuel/master' into master.

Browse source 
Updated migration date to today.

Conflicts:
	db/schema.rb
This commit is contained in:
wvengen 2013-07-18 18:48:49 +02:00
commit 74bfc85562
21 changed files with 269 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

3
config/routes.rb
View file

@ -8,6 +8,7 @@ Foodsoft::Application.routes.draw do
root :to => redirect("/#{FoodsoftConfig.scope}")
scope '/:foodcoop' do
# Root path
@ -187,7 +188,7 @@ Foodsoft::Application.routes.draw do
############## Feedback
resource :feedback, :only => [:new, :create], :controller => 'feedback'
############## The rest
resources :users, :only => [:index]