Alberto Garcia Cabeza c048f25941 Fixes conflicts

2015-08-08 13:28:29 +02:00

..

confirmations

Adds styles for authentication pages

2015-08-06 20:53:14 +02:00

mailer

adds i18n to all devise views

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

menu

Changes styles for header

2015-08-07 23:23:16 +02:00

passwords

Adds styles for authentication pages

2015-08-06 20:53:14 +02:00

registrations

Adds styles for account page and edit user

2015-08-08 13:21:46 +02:00

sessions

Adds styles for authentication pages

2015-08-06 20:53:14 +02:00

shared

Adds styles for authentication pages

2015-07-30 19:51:33 +02:00

unlocks

adds i18n to all devise views

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