Juanjo Bazán 984984473f Fix conflict

2015-07-18 21:58:43 +02:00

..

confirmations

adds devise configuration [#6]

2015-07-16 19:47:54 +02:00

mailer

adds devise configuration [#6]

2015-07-16 19:47:54 +02:00

menu

Fix conflict

2015-07-18 21:58:43 +02:00

passwords

adds devise configuration [#6]

2015-07-16 19:47:54 +02:00

registrations

adds first name and last name to users

2015-07-17 19:52:55 +02:00

sessions

adds devise configuration [#6]

2015-07-16 19:47:54 +02:00

shared

adds devise configuration [#6]

2015-07-16 19:47:54 +02:00

unlocks

adds devise configuration [#6]

2015-07-16 19:47:54 +02:00