Claire bd349cb850 Merge commit 'ce1f35d7e213327549b960bb64f63c67a141ea40' into glitch-soc/merge-upstream ...

Conflicts:
- `db/schema.rb`:
  Upstream regenerated the schema file using Rails 7, the conflicts are
  caused by our extra columns.
  Applied upstream's changes, but keeping our extra columns.

2023-07-30 14:58:56 +02:00

..

core

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

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

flavours

[Glitch] Replace 'favourite' by 'favorite' for American English

2023-07-30 14:44:36 +02:00

fonts

…

hooks

…

icons

…

images

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

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

mastodon

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

2023-07-30 14:58:56 +02:00

packs

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

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

skins

…

styles

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

2023-07-30 14:58:56 +02:00

types

Remove duplicate JPG type (#25054)

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