Claire 8089fa6935 Merge commit 'a7264a2b42631bd876d114b96f689492e2908a8d' into glitch-soc/merge-upstream ...

Conflicts:
- `app/views/layouts/application.html.haml`:
  Conflict because of glitch-soc's different theming system.
  Ported upstream's change.

2024-06-17 18:14:14 +02:00

..

__mocks__

…

entrypoints

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

2024-05-29 17:03:24 +02:00

flavours

[Glitch] Add author links on the explore page in web UI

2024-06-17 14:08:08 +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 'a7264a2b42631bd876d114b96f689492e2908a8d' into glitch-soc/merge-upstream

2024-06-17 18:14:14 +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 '3a191b3797dde1daf79cd748a14b87240532d543' into glitch-soc/merge-upstream

2024-06-17 13:41:58 +02:00

svg-icons

…

types

…