Claire 0e7466717f Merge commit '391c089d0db58d731765dba730a5e1f2fe8570a6' into glitch-soc/merge-upstream ...

Conflicts:
- `.github/dependabot.yml`:
  We removed it from glitch-soc.
  Keep it deleted.

2023-05-28 16:41:14 +02:00

..

core

Merge commit 'd27216dc4616d80659c0cc5d2a55394e0e1ae874' into glitch-soc/merge-upstream

2023-05-28 15:54:31 +02:00

flavours

Fix import order with ESLint

2023-05-28 16:38:10 +02:00

fonts

…

hooks

[Proposal] Make able to write React in Typescript (#16210)

2023-04-03 03:31:39 +02:00

icons

…

images

Merge branch 'main' into glitch-soc/merge-upstream

2023-04-29 10:44:56 +02:00

locales

Move locale-data back to app/javascript/mastodon/locales/locale-data (#2169)

2023-04-08 14:11:40 +02:00

mastodon

Merge commit '391c089d0db58d731765dba730a5e1f2fe8570a6' into glitch-soc/merge-upstream

2023-05-28 16:41:14 +02:00

packs

Merge commit 'd27216dc4616d80659c0cc5d2a55394e0e1ae874' into glitch-soc/merge-upstream

2023-05-28 15:54:31 +02:00

skins

…

styles

Merge commit 'bec6a1cad4c509c53deb378c7ba984ba7e2de5a9' into glitch-soc/merge-upstream

2023-05-25 22:49:18 +02:00

types

Remove duplicate JPG type (#25054)

2023-05-22 12:46:20 +02:00