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

Hotfix/v1.5.9 #5295

Merged
merged 4 commits into from
Mar 11, 2021
Merged

Hotfix/v1.5.9 #5295

merged 4 commits into from
Mar 11, 2021

Conversation

ripcurlx
Copy link
Contributor

No description provided.

ripcurlx and others added 4 commits March 2, 2021 18:53
# Conflicts:
#	build.gradle
#	desktop/package/linux/Dockerfile
#	desktop/package/linux/package.sh
#	desktop/package/linux/release.sh
#	desktop/package/macosx/create_app.sh
#	desktop/package/macosx/finalize.sh
#	desktop/package/macosx/insert_snapshot_version.sh
#	desktop/package/windows/package.bat
#	desktop/package/windows/release.bat
#	relay/src/main/resources/version.txt
@ripcurlx ripcurlx requested a review from sqrrm March 11, 2021 15:27
@ripcurlx
Copy link
Contributor Author

Completely forgot to merge it after the hotfix 😬

Copy link
Member

@sqrrm sqrrm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK

@ripcurlx ripcurlx merged commit e1e7ca6 into master Mar 11, 2021
@ripcurlx ripcurlx deleted the hotfix/v1.5.9 branch April 21, 2021 07:26
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