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

Merge remote-tracking branch 'bennibu/rails3' into rails3

Browse source 
Conflicts:
	app/controllers/login_controller.rb
	app/models/message.rb
	app/views/sessions/new.html.haml
This commit is contained in:
wvengen 2013-04-04 00:29:50 +02:00
commit 0bb080526a
7 changed files with 29 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/sessions/new.html.haml
View file

@ -24,4 +24,4 @@
.control-group
.controls
= submit_tag t('.login'), class: 'btn'
= link_to t('.forgot_password'), :controller => 'login', :action => 'forgot_password'
= link_to t('.forgot_password'), forgot_password_path