Merge branch 'main' into api

Gemfile

Gemfile.lock

app/models/communication/extranet/document/category.rb

app/models/communication/extranet/document/kind.rb

app/models/education/academic_year.rb

app/models/education/cohort.rb

app/models/education/program/with_alumni.rb

app/models/education/school/with_alumni.rb

app/models/education/school/with_programs.rb

app/models/university/with_communication.rb

app/models/university/with_education.rb

app/models/university/with_people_and_organizations.rb

...in/communication/websites/categories/_treebranch.html.erb

...ws/admin/communication/websites/categories/index.html.erb

bin/setup

config/application.rb

config/environments/development.rb

config/environments/production.rb

config/environments/test.rb

config/initializers/active_storage.rb