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

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

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

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

...admin/communication/blocks/templates/embed/_edit.html.erb

...in/communication/blocks/templates/embed/_preview.html.erb

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

...admin/communication/blocks/templates/files/_edit.html.erb

...in/communication/blocks/templates/files/_preview.html.erb

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

...admin/communication/blocks/templates/video/_edit.html.erb

...in/communication/blocks/templates/video/_preview.html.erb

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

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

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

config/locales/communication/en.yml

config/locales/communication/fr.yml

lib/tasks/app.rake