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

app/views/admin/communication/website/pages/show.html.erb

app/views/admin/communication/website/pages/static.html.erb

app/views/admin/education/programs/_form.html.erb

app/views/admin/education/programs/show.html.erb

app/views/admin/education/programs/static.html.erb

config/locales/communication/en.yml

config/locales/communication/fr.yml

config/routes/admin/communication.rb

db/migrate/20220224131614_rename_blocks.rb

...ove_communication_website_id_from_communication_blocks.rb

db/schema.rb

docs/communication/websites/blocks.md