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 master into develop #90

Merged
merged 7 commits into from
Feb 29, 2024
Merged

Merge master into develop #90

merged 7 commits into from
Feb 29, 2024

Conversation

fluxxcode
Copy link
Owner

@fluxxcode fluxxcode commented Feb 29, 2024

Merge branch master into develop because of merge conflicts.

fluxxcode and others added 7 commits February 3, 2024 16:14
Merge develop into master
Merge develop into master
* Fix shortcut directories can not be selected (#43)

* Fix root directories not correctly displayed (#44)

* Update CI/CD (#46)

* Move FileDialog::update (#47)

* Fix display name of root directories on Windows (#48)

* Update planned features (#49)

* Add Pinnable folders to planned features

* Increase versions
@fluxxcode fluxxcode merged commit 19288d7 into develop Feb 29, 2024
1 check passed
@fluxxcode fluxxcode deleted the cleanup/merge_master branch February 29, 2024 20:30
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