rgarcia 95101c4cc8 fixing conflicts [#45]

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

..

confirmations

merges master and fixes conflicts

2015-07-29 13:00:33 +02:00

mailer

adds i18n to all devise views

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

menu

adds i18n to all devise views

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

passwords

adds i18n to all devise views

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

registrations

fixing conflicts [#45]

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

sessions

merges master and fixes conflicts

2015-07-29 13:00:33 +02:00

shared

adds i18n to all devise views

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

unlocks

adds i18n to all devise views

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