Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

cleaning-portalmec
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

1510c51d

Commit 1510c51d authored 9 years ago by Matheus Agio Nerone

Downloads
- Plain Diff

fix merge conflicts


Signed-off-by: Matheus Agio Nerone <man13@inf.ufpr.br>

parents fc1159e7 9f7c670d

No related branches found

No related tags found

Loading

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

.ruby-version 1 addition, 0 deletions

.ruby-version
Gemfile 3 additions, 0 deletions

Gemfile
app/views/devise/confirmations/new.html.erb 16 additions, 0 deletions

app/views/devise/confirmations/new.html.erb
app/views/devise/mailer/confirmation_instructions.html.erb 5 additions, 0 deletions

app/views/devise/mailer/confirmation_instructions.html.erb
app/views/devise/mailer/reset_password_instructions.html.erb 8 additions, 0 deletions

app/views/devise/mailer/reset_password_instructions.html.erb
app/views/devise/mailer/unlock_instructions.html.erb 7 additions, 0 deletions

app/views/devise/mailer/unlock_instructions.html.erb
app/views/devise/passwords/edit.html.erb 25 additions, 0 deletions

app/views/devise/passwords/edit.html.erb
app/views/devise/passwords/new.html.erb 16 additions, 0 deletions

app/views/devise/passwords/new.html.erb
app/views/devise/registrations/edit.html.erb 39 additions, 0 deletions

app/views/devise/registrations/edit.html.erb
app/views/devise/registrations/new.html.erb 29 additions, 0 deletions

app/views/devise/registrations/new.html.erb
app/views/devise/sessions/new.html.erb 26 additions, 0 deletions

app/views/devise/sessions/new.html.erb
app/views/devise/shared/_links.html.erb 25 additions, 0 deletions

app/views/devise/shared/_links.html.erb
app/views/devise/unlocks/new.html.erb 16 additions, 0 deletions

app/views/devise/unlocks/new.html.erb

with 216 additions and 0 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment