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.

Sign up for GitHub

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

Jump to bottom

Merge upstream changes up to e08d22724d9baf6c639466507c2b117788e5b8de #2822

Merged
merged 6 commits into from
Aug 23, 2024
Merged

Merge upstream changes up to e08d22724d9baf6c639466507c2b117788e5b8de #2822

merged 6 commits into from
Aug 23, 2024

Conversation

ClearlyClaire
Copy link

@ClearlyClaire ClearlyClaire commented Aug 22, 2024 •
edited
Loading

Ported changes

Postponed changes

Additional changes

  • e18bd04 (extract translation strings that have been removed upstream with 500f492)
  • 532b53e (fix build because of different webpack config)

@ClearlyClaire ClearlyClaire marked this pull request as ready for review August 22, 2024 21:27
@ClearlyClaire ClearlyClaire merged commit ae9bd63 into glitch-soc:main Aug 23, 2024
30 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ClearlyClaire @Gargron