Claire 42f36aa55a Merge commit '5b457961fc1189a71599dc6c06b3f159b195a455' into glitch-soc/merge-upstream ...

Conflicts:
- `config/initializers/content_security_policy.rb`:
  Upstream fixed an issue that was not present in glitch-soc.
  Kept our version.

2023-07-30 13:49:35 +02:00

..

core

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

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

flavours

[Glitch] Fix a missing redirection on getting-started in multi column mode

2023-07-30 13:32:16 +02:00

fonts

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

2022-10-28 19:23:58 +02:00

hooks

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

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

icons

png optimization(loss less) (#19630)

2022-11-01 15:06:52 +01:00

images

Merge commit '55e7c08a83547424024bac311d5459cb82cf6dae' into glitch-soc/merge-upstream

2023-06-25 14:27:38 +02:00

mastodon

Merge commit '5b457961fc1189a71599dc6c06b3f159b195a455' into glitch-soc/merge-upstream

2023-07-30 13:49:35 +02:00

packs

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

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

skins

initial translation of Glitch-specific texts into Czech (#1997)

2022-12-08 10:38:52 +01:00

styles

Merge commit '5b457961fc1189a71599dc6c06b3f159b195a455' into glitch-soc/merge-upstream

2023-07-30 13:49:35 +02:00

types

Remove duplicate JPG type (#25054)

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