Merge commit '77cd16f4ee7ab807df6fffb1538a6659a8182a9e' into glitch-soc/merge-upstream

Conflicts:
- `app/javascript/styles/mastodon/components.scss`:
  Conflict caused by glitch-soc changing the path to images, and upstream
  removing styling using such an image.
  Removed the styling as upstream did.
- `app/models/account.rb`:
  Conflict due to upstream changing lines adjacent to a change made in glitch-soc
  to have configurable limits.
  Ported upstream's changes.
- `yarn.lock`:
  Dependencies adjacent to glitch-soc-only dependencies updated.
  Updated them as well.

This commit is contained in:

Claire

2024-10-26 13:38:07 +02:00

parent 075a4492f7 77cd16f4ee

commit 8103e69b17

78 changed files with 2363 additions and 2051 deletions

									
										.github/workflows/check-i18n.yml
									
		+1
		-1
	
												View File
												
				@@ -18,7 +18,7 @@ permissions:

				jobs:

				  check-i18n:

				    runs-on: ubuntu-22.04

				    runs-on: ubuntu-24.04

				    steps:

				      - uses: actions/checkout@v4