Merge pull request #2422 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Merge branch 'main' into glitch-soc/merge-upstream
Bump version to v4.2.0 (#27017)
Merge pull request #2419 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
Upstream changed their README, we have a completely different one.
Kept our version.
Update changelog (#26992)
Merge pull request #2416 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Merge branch 'main' into glitch-soc/merge-upstream
Bump version to v4.2.0-rc2 (#26974)
Bump version to v4.2.0-rc1 (#26916)
Merge pull request #2396 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Bump version to v4.2.0-beta3 (#26753)
Merge pull request #2392 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes into glitch-soc
Merge pull request #2383 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes