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

4975b6ce

Commit 4975b6ce authored 3 years ago by pabois

Downloads
- Plain Diff

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

parents 44edc493 3c258ced

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

app/assets/images/osuny.png 0 additions, 0 deletions

app/assets/images/osuny.png
app/models/university/person/involvement.rb 1 addition, 0 deletions

app/models/university/person/involvement.rb
app/views/admin/education/teachers/edit.html.erb 2 additions, 0 deletions

app/views/admin/education/teachers/edit.html.erb
app/views/admin/education/teachers/show.html.erb 1 addition, 1 deletion

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

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

config/locales/education/fr.yml
config/locales/university/en.yml 3 additions, 0 deletions

config/locales/university/en.yml
config/locales/university/fr.yml 3 additions, 0 deletions

config/locales/university/fr.yml

with 15 additions and 1 deletion

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