Claire c48ec9cb8c Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' into glitch-soc/merge-upstream ...

Conflicts:
- `config/initializers/content_security_policy.rb`:
  Kept our version, it was not affected by upstream's bug.

2023-06-10 16:48:01 +02:00

..

core

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

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

flavours

[Glitch] Add data-nosnippet so Google doesn't use trending posts in snippets for /

2023-06-10 16:38:03 +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

Merge commit '44cd88adc4e2f4028dcc2b08b98368f0dc90cee4' into glitch-soc/merge-upstream

2023-06-10 12:38:33 +02:00

mastodon

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

2023-06-10 16:48:01 +02:00

packs

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

2023-06-10 15:32:29 +02:00

skins

…

styles

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

2023-06-10 16:48:01 +02:00

types

Remove duplicate JPG type (#25054)

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