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.

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

Merge: nextfeat/new-admin-ui #4499

Merged
merged 36 commits into from
Jan 23, 2025

Conversation

adrians5j
Copy link
Member

This PR merges changes from next into feat/new-admin-ui branch.

adrians5j and others added 21 commits January 10, 2025 13:19
…xt-to-new-admin-ui-2025-01-21

# Conflicts:
#	.prettierignore
#	packages/serverless-cms-aws/package.json
#	packages/ui/package.json
#	packages/ui/src/AutoComplete/MultiAutoComplete.tsx
#	packages/ui/tsconfig.build.json
#	packages/ui/tsconfig.json
#	yarn.lock
@adrians5j adrians5j changed the base branch from next to feat/new-admin-ui January 21, 2025 10:56
@webiny-bot webiny-bot added this to the 5.43.0 milestone Jan 21, 2025
@adrians5j adrians5j marked this pull request as ready for review January 21, 2025 14:35
…into merge/next-to-new-admin-ui-2025-01-21

# Conflicts:
#	packages/admin-ui/package.json
#	yarn.lock
…into merge/next-to-new-admin-ui-2025-01-21

# Conflicts:
#	packages/ui/package.json
#	yarn.lock
@adrians5j adrians5j merged commit 4b8fe92 into feat/new-admin-ui Jan 23, 2025
133 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants