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

1.23.14 to 2.0.0 #4886

Merged
merged 5 commits into from
Jun 26, 2024
Merged

1.23.14 to 2.0.0 #4886

merged 5 commits into from
Jun 26, 2024

Conversation

louislam
Copy link
Owner

No description provided.

@github-actions github-actions bot added the pr:please resolve merge conflict A merge-conflict needs to be addressed before reviewing makes sense again label Jun 26, 2024
# Conflicts:
#	src/lang/en.json
#	src/util.js
#	src/util.ts
@github-actions github-actions bot removed the pr:please resolve merge conflict A merge-conflict needs to be addressed before reviewing makes sense again label Jun 26, 2024
@louislam louislam merged commit 8efbe95 into master Jun 26, 2024
18 checks passed
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.

3 participants