Claire 2810231180 Merge commit 'b2388be71eb0031ef9e47c492b1c038231cd8bc0' into glitch-soc/merge-upstream ...

Conflicts:
- `app/controllers/activitypub/collections_controller.rb`:
  Upstream renamed a helper method everywhere.
  There was one glitch-soc line involving changes because of the local-only post
  feature.
  Ported upstream's change.

2024-05-16 19:30:10 +02:00

..

__mocks__

…

entrypoints

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

2024-05-04 16:28:30 +02:00

flavours

[Glitch] Fix missing prop warning for <Account>

2024-05-14 20:53:40 +02:00

fonts

…

hooks

…

icons

…

images

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

2024-03-19 19:21:12 +01:00

mastodon

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

2024-05-16 19:30:10 +02:00

material-icons

Merge commit '7201f99cf83a74331febd1624ca9aaace68af5e6' into glitch-soc/merge-upstream

2024-05-04 15:24:22 +02:00

skins

Rename app/javascript/flavours/glitch/styles/index.scss to application.scss

2024-04-30 21:03:04 +02:00

styles

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

2024-05-16 19:30:10 +02:00

svg-icons

…

types

…