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

More Content #379

Merged
merged 59 commits into from
Mar 16, 2024
Merged

More Content #379

merged 59 commits into from
Mar 16, 2024

Conversation

klorpa
Copy link
Contributor

@klorpa klorpa commented Oct 29, 2023

No description provided.

@hmlendea
Copy link
Owner

hmlendea commented Nov 28, 2023

Hi. Thanks for your contributions!

I think we should try to merge this as soon as possible. There have been quite a few PRs open for a while and some of them do a lot of changes. I've already merged one of mine and had to solve A LOT of merge conflicts on another one when updating from master (mostly in regards to language fallbacks, which are getting out of hand and I'm considering a new system entirely, but that's another story).

So, I think we should solve the remaining validation errors, update the branch from master, and then merge this.
Let me know if you need any help.

@hmlendea hmlendea merged commit 8099157 into hmlendea:master Mar 16, 2024
2 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.

2 participants