merge main

Gemfile

Gemfile.lock

...s/images/communication/blocks/templates/partners/grid.png

...ts/images/communication/blocks/templates/partners/map.png

app/assets/stylesheets/extranet/layout/_nav.sass

app/assets/stylesheets/extranet/pages/_organization.sass

app/controllers/admin/communication/blocks_controller.rb

...ollers/admin/communication/extranets/alumni_controller.rb

...s/admin/communication/extranets/application_controller.rb

...ollers/admin/communication/extranets/assets_controller.rb

...lers/admin/communication/extranets/contacts_controller.rb

...trollers/admin/communication/extranets/jobs_controller.rb

...rollers/admin/communication/extranets/posts_controller.rb

app/controllers/admin/communication/extranets_controller.rb

app/controllers/extranet/alumni/academic_years_controller.rb

app/controllers/extranet/alumni/application_controller.rb

app/controllers/extranet/alumni/cohorts_controller.rb

app/controllers/extranet/alumni/organizations_controller.rb

app/controllers/extranet/alumni/persons_controller.rb

app/controllers/extranet/contacts/application_controller.rb