Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge EDS into amplify-components #456

Merged
merged 12 commits into from
Feb 22, 2024
Merged

Merge EDS into amplify-components #456

merged 12 commits into from
Feb 22, 2024

Conversation

mariush2
Copy link
Contributor

@mariush2 mariush2 commented Feb 22, 2024 •
edited by azure-boards bot
Loading

@mariush2 mariush2 requested a review from a team as a code owner February 22, 2024 11:58
@mariush2
Merge remote-tracking branch 'origin/main' into feat/merge-eds-into
d50999b 
# Conflicts:
#	package-lock.json
#	package.json
@aslakihle aslakihle self-requested a review February 22, 2024 12:04
aslakihle
aslakihle requested changes Feb 22, 2024
View reviewed changes
.storybook/preview.jsx Outdated Show resolved Hide resolved
src/components/Inputs/Search/Search.docs.mdx Outdated Show resolved Hide resolved
src/components/Inputs/Search/Search.docs.mdx Show resolved Hide resolved
src/components/Typography/Typography.docs.mdx Outdated Show resolved Hide resolved
@mariush2 mariush2 requested a review from aslakihle February 22, 2024 12:46
@mariush2 mariush2 merged commit 3217282 into main Feb 22, 2024
5 checks passed
@mariush2 mariush2 deleted the feat/merge-eds-into branch February 22, 2024 12:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aslakihle aslakihle aslakihle approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@mariush2 @aslakihle