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 release branch into master #3653

Merged
merged 3 commits into from
Dec 10, 2021
Merged

Conversation

bhennion
Copy link
Contributor

@bhennion bhennion commented Dec 10, 2021

This premature merging is for including #3652 rapidly into master. The bug this PR fixed creates (slightly) corrupt saved files.

@bhennion
Copy link
Contributor Author

bhennion commented Dec 10, 2021

This also merges #3590 from the release branch to master. There was no conflicts and .PDF/.pDf files are still opened as they should.

Merging in 12h unless someone objects.

@bhennion bhennion added the merge proposed Merge was proposed by maintainer label Dec 10, 2021
@bhennion bhennion merged commit a57d8eb into xournalpp:master Dec 10, 2021
@bhennion bhennion deleted the pr/Mergerelease branch December 10, 2021 17:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merge proposed Merge was proposed by maintainer
Projects
None yet
2 participants