merge

assets/sass/_theme/_configuration.sass

assets/sass/_theme/_utils.sass

assets/sass/_theme/design-system/search.sass

assets/sass/_theme/design-system/typography.sass

config.yaml

layouts/events/single.html

layouts/partials/CorrectPunctuation

layouts/partials/GetTruncateContent

layouts/partials/PrepareHTML

layouts/partials/PrepareText

layouts/partials/blocks/templates/definitions.html

layouts/partials/blocks/templates/features.html

layouts/partials/blocks/templates/gallery/carousel.html

layouts/partials/blocks/templates/gallery/grid.html

layouts/partials/blocks/templates/pages/list.html

layouts/partials/blocks/templates/posts/large.html

layouts/partials/blocks/templates/sound.html

layouts/partials/blocks/templates/timeline/horizontal.html

layouts/partials/blocks/templates/timeline/vertical.html

layouts/partials/commons/image-default.html