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

[pull] main from bluefin-main #900

Closed
wants to merge 71 commits into from
Closed

Conversation

ethanjli
Copy link

@ethanjli ethanjli commented Feb 12, 2024

This PR supercedes #66 by manually resolving the merge conflicts on bluefin-main with main.

ethanjli and others added 30 commits November 7, 2023 09:43
* feat: mark Fedora 39 as stable (ublue-os#646)

* fix: Correct issues with desktop portal (ublue-os#647)

---------

Co-authored-by: bobslept <[email protected]>
Co-authored-by: Kyle Gospodnetich <[email protected]>
Co-authored-by: Ethan Li <[email protected]>
* feat: mark Fedora 39 as stable (ublue-os#646)

* fix: Correct issues with desktop portal (ublue-os#647)

---------

Co-authored-by: bobslept <[email protected]>
Co-authored-by: Kyle Gospodnetich <[email protected]>
Co-authored-by: Ethan Li <[email protected]>
* feat: Add Waydroid

* feat: Add Waydroid initialization command to justfile
* chore: add an issue template (ublue-os#675)

* fix: remove ddccontrol (ublue-os#676)

* fix: turn off gnome vrr by default (ublue-os#674)

---------

Co-authored-by: Jorge O. Castro <[email protected]>
* chore: add an issue template (ublue-os#675)

* fix: remove ddccontrol (ublue-os#676)

* fix: turn off gnome vrr by default (ublue-os#674)

* feat: add hplip (ublue-os#678)

* chore(just): brew moved to config repo (ublue-os#679)

* chore(yafti): update forum link (ublue-os#682)

* chore(yafti): update docs links (ublue-os#683)

* feat(just): combine devmode on/off with gum (ublue-os#685)

* chore(readme): update links (ublue-os#684)

Co-authored-by: Jorge O. Castro <[email protected]>

* fix: increase open file limit (ublue-os#686)

---------

Co-authored-by: Jorge O. Castro <[email protected]>
Co-authored-by: bobslept <[email protected]>
[pull] main from bluefin-main
[pull] main from bluefin-main
[pull] main from bluefin-main
[pull] main from bluefin-main
[pull] main from bluefin-main
[pull] main from bluefin-main
[pull] bluefin-main from ublue-os:main
[pull] bluefin-main from ublue-os:main
[pull] main from bluefin-main
@ethanjli ethanjli requested a review from castrojo as a code owner February 12, 2024 17:09
@ethanjli ethanjli closed this Feb 12, 2024
@ethanjli
Copy link
Author

(sorry, I once again forgot to change the base branch of my PR to the main branch in my own repo!)

@castrojo
Copy link
Member

Heh it's ok it happens! cc @EyeCantCU @noelmiller so I can connect "bluefin but kinoite" folks together!

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