Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

A

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

Snippets Groups Projects

7fa8a1a7

Commit 7fa8a1a7 authored 3 years ago by pabois

Downloads
- Plain Diff

Merge branch 'master' of github.com:noesya/osuny

parents 2ac5451c 082aefcd

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

app/controllers/admin/education/program/teachers_controller.rb 1 addition, 1 deletion

...ontrollers/admin/education/program/teachers_controller.rb
app/controllers/admin/education/teachers_controller.rb 1 addition, 1 deletion

app/controllers/admin/education/teachers_controller.rb
app/views/admin/education/teachers/show.html.erb 32 additions, 6 deletions

app/views/admin/education/teachers/show.html.erb
config/locales/en.yml 1 addition, 0 deletions

config/locales/en.yml
config/locales/fr.yml 1 addition, 0 deletions

config/locales/fr.yml

with 36 additions and 8 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