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

app/models/administration/location.rb

app/models/communication/block/template/datatable.rb

app/views/admin/communication/websites/_form.html.erb

app/views/devise/two_factor_authentication/show.html.erb

app/views/server/emergency_messages/index.html.erb

config/locales/communication/contents/en.yml

config/locales/communication/contents/fr.yml

config/locales/fr.yml