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

e7cc2572

Commit e7cc2572 authored 9 years ago by Mauricio Giacomini Girardello

Downloads
- Plain Diff

Merge branch 'fix-translation' into 'master'

Fix translation



See merge request !125

parents 1772887e ddc8d67f

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

Gemfile.lock 0 additions, 390 deletions

Gemfile.lock
app/controllers/complaints_controller.rb 1 addition, 1 deletion

app/controllers/complaints_controller.rb
app/controllers/management/users_controller.rb 2 additions, 2 deletions

app/controllers/management/users_controller.rb
app/views/learning_objects/_form.html.erb 2 additions, 1 deletion

app/views/learning_objects/_form.html.erb
app/views/management/complaints/index.html.erb 2 additions, 2 deletions

app/views/management/complaints/index.html.erb
app/views/management/users/admins.html.erb 14 additions, 3 deletions

app/views/management/users/admins.html.erb
app/views/management/users/curators.html.erb 12 additions, 2 deletions

app/views/management/users/curators.html.erb
app/views/management/users/index.html.erb 13 additions, 2 deletions

app/views/management/users/index.html.erb

with 46 additions and 403 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