Merge branch 'main' into update-latest-changes-from-portfolio-1 · wpengine/atlas-blueprint-basic@97c8b15 · GitHub

This repository has been archived by the owner on Dec 11, 2023. It is now read-only.

Commit

Merge branch 'main' into update-latest-changes-from-portfolio-1

Browse files

# Conflicts:
#	src/components/ContentWrapper/ContentWrapper.module.scss
#	src/components/Posts/Posts.js
#	src/components/ThemeStyles/ThemeStyles.js
#	src/styles/_Grid.scss
#	src/styles/_Variables.scss

Loading branch information

theodesp committed Apr 1, 2022

2 parents 2911418 + d0cd426 commit 97c8b15