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

Backport 0.14.0 to 232 #297

Merged
merged 3 commits into from
Feb 13, 2024
Merged

Backport 0.14.0 to 232 #297

merged 3 commits into from
Feb 13, 2024

Conversation

rock3r
Copy link
Collaborator

@rock3r rock3r commented Feb 12, 2024

Includes relevant changes from these PRs:

Backport for release 0.14.0 to 232

rock3r and others added 3 commits February 1, 2024 19:06
Additional branches have been created for 233 and 232. The main branch
now tracks 241 EAPs.
Includes relevant changes from these PRs:
#290 — Add support for 241
#292 — Switch to the new branching strategy
#293 — Fix icon loading and errors in bridge for 241
#294 — Add Markdown renderer code and sample
@rock3r rock3r added the backport Backports fixes and features from main label Feb 12, 2024
@rock3r rock3r self-assigned this Feb 12, 2024
@rock3r rock3r requested a review from lamba92 February 12, 2024 18:00
@rock3r rock3r merged commit a07d394 into main Feb 13, 2024
10 checks passed
@rock3r rock3r deleted the releases/232 branch February 13, 2024 09:13
rock3r added a commit that referenced this pull request Feb 13, 2024
@rock3r rock3r restored the releases/232 branch February 13, 2024 09:19
@rock3r
Copy link
Collaborator Author

rock3r commented Feb 13, 2024

Turns out I shouldn't do these PRs this way, because GitHub gets reeeeal confused and wants to merge the release branch into main instead of the other way round...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport Backports fixes and features from main
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants