rgarcia e08ed41e98 fixes conflicts with master

2015-10-14 15:48:55 +02:00

..

new.html.erb

fixes conflicts with master

2015-10-14 15:48:55 +02:00

show.html.erb

Modifies devise so that unconfirmed users w/o password can set it when confirming their account

2015-10-07 20:18:54 +02:00