rgarcia 95101c4cc8 fixing conflicts [#45]

2015-07-29 13:36:48 +02:00

..

edit.html.erb

adds i18n to all devise views

2015-07-29 12:18:55 +02:00

new.html.erb

fixing conflicts [#45]

2015-07-29 13:36:48 +02:00