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

Devel #276

Merged
merged 88 commits into from
Dec 27, 2022
Merged

Devel #276

merged 88 commits into from
Dec 27, 2022

Conversation

Osiris-Team
Copy link
Collaborator

No description provided.

kerner1000 and others added 30 commits July 19, 2022 20:15
Upgrade some deps to address vulnerabilities.
Extract code into methods as a preparation for further refactorings.
…anged when modifying or adding new stuff;

iconFile was not present in gradle PackageTask before, added that;
renamed appName to name (gradle);
renamed appDescription to description (gradle);
@Osiris-Team Osiris-Team merged commit 9e46a86 into fvarrui:master Dec 27, 2022
@fvarrui
Copy link
Owner

fvarrui commented Jan 12, 2023

Hi @Osiris-Team!

Thanks for merging your changes, but I think it would still have been better to do the merge in devel, because what is in master is what has been released and 1.7.0 is not released yet, so several changes/fixes in devel have been left behind. Could you revert this PR and merge your changes into devel , please? Sorry for the inconveniences.

Thanks!!

@Osiris-Team
Copy link
Collaborator Author

Osiris-Team commented Jan 12, 2023

@fvarrui Oh boi I didn't mean to merge it... Now reverted it.
What I did was merge the devel branch onto master, but in my fork.
Sorry guess I messed up somehow!

@fvarrui
Copy link
Owner

fvarrui commented Jan 12, 2023

Don't worry 😅
sometimes happens!

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.

4 participants