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

app/controllers/admin/education/diplomas_controller.rb

app/controllers/admin/education/programs_controller.rb

app/models/education/diploma.rb

app/models/education/program.rb

...nication/blocks/templates/call_to_action/_static.html.erb

...n/communication/blocks/templates/gallery/_static.html.erb

...tion/blocks/templates/organization_chart/_static.html.erb

.../communication/blocks/templates/partners/_static.html.erb

...munication/blocks/templates/testimonials/_static.html.erb

...min/communication/blocks/templates/video/_static.html.erb

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

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

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

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

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

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

config/locales/education/en.yml

config/locales/education/fr.yml

...igrate/20220516095044_add_fields_to_education_diplomas.rb

db/schema.rb