9a40ecd1d9
Conflicts: app/views/devise/passwords/new.html.erb app/views/devise/sessions/new.html.erb |
||
---|---|---|
.. | ||
admin | ||
devise | ||
js | ||
kaminari | ||
layouts | ||
.swp |
9a40ecd1d9
Conflicts: app/views/devise/passwords/new.html.erb app/views/devise/sessions/new.html.erb |
||
---|---|---|
.. | ||
admin | ||
devise | ||
js | ||
kaminari | ||
layouts | ||
.swp |