merge

app/assets/images/osuny-black.svg

app/assets/images/osuny-white.svg

app/assets/stylesheets/admin/appstack/style.sass

app/assets/stylesheets/admin/pure/style.sass

app/assets/stylesheets/admin/pure/variables.sass

app/controllers/admin/application_controller.rb

app/controllers/admin/communication/websites_controller.rb

app/controllers/admin/research/journals_controller.rb

app/helpers/admin/application_helper.rb

app/views/admin/application/_dependencies.html.erb

app/views/admin/application/a11y/_widget.html.erb

app/views/admin/application/featured_image/_edit.html.erb

app/views/admin/application/featured_image/_show.html.erb

app/views/admin/application/meta_description/_form.html.erb

app/views/admin/application/meta_description/_show.html.erb

app/views/admin/application/summary/_show.html.erb

app/views/admin/communication/blocks/_list.html.erb

...min/communication/blocks/components/layout/_edit.html.erb

app/views/admin/communication/blocks/edit.html.erb

app/views/admin/communication/blocks/new.html.erb