Resolve conflicts#3928

Merged

jjw24 merged 4 commits intodevfrom

resolve_conflicts

Aug 31, 2025

Commits on Jun 3, 2025

Merge pull request #3269 from Flow-Launcher/dev
jjw24
authored

Commits on Jun 14, 2025

Release 1.20.1 | Plugin 4.6.0 (#3706)
jjw24
authored

Commits on Jul 13, 2025

Release 1.20.2 | Plugin 4.7.0 (#3820)
jjw24
authored

Commits on Aug 31, 2025

Merge remote-tracking branch 'origin/master' into resolve_conflicts
jjw24
committed