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 #4358

Merged
merged 163 commits into from
Nov 1, 2024

Conversation

adrians5j
Copy link
Member

@adrians5j adrians5j commented Oct 31, 2024

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

adrians5j and others added 30 commits June 27, 2024 22:45
# Conflicts:
#	packages/lexical-editor-pb-element/src/LexicalEditor.tsx
#	yarn.lock
@adrians5j adrians5j changed the title Feat/new admin UI merge attempt 2 Merge: nextfeat/new-admin-ui Oct 31, 2024
@adrians5j adrians5j changed the base branch from next to feat/new-admin-ui November 1, 2024 05:26
@adrians5j adrians5j merged commit bd7b8cf into feat/new-admin-ui Nov 1, 2024
10 checks passed
@adrians5j adrians5j deleted the feat/new-admin-ui-merge-attempt-2 branch November 12, 2024 09:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants