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

app/controllers/admin/university/people_controller.rb

app/controllers/media_controller.rb

app/models/communication/website/home.rb

app/models/communication/website/page.rb

app/models/communication/website/post.rb

app/models/education/program.rb

app/models/research/journal/article.rb

app/models/research/journal/volume.rb

app/models/university/person.rb

app/models/university/person/administrator.rb

app/models/university/person/author.rb

app/models/university/person/researcher.rb

app/models/university/person/teacher.rb

app/views/admin/research/journal/articles/static.html.erb

app/views/admin/university/people/_form.html.erb

config/locales/university/en.yml

config/locales/university/fr.yml

...20220119162026_add_lab_attributes_to_university_people.rb

db/schema.rb