Claire a482932649 Merge commit '6f7615ba86afda56e1d661442286a1d68467a525' into glitch-soc/merge-upstream ...

Conflicts:
- `app/controllers/application_controller.rb`:
  Not a real conflict, upstream fixed a bug in a line adjacent to code
  modified by glitch-soc.
  Ported upstream's change.

2024-02-27 19:20:57 +01:00

..

__mocks__

Change icon SVG imports to use a default import (#28709)

2024-01-12 10:31:24 +00:00

core

Merge commit '8156113d58db851d00f8052e66459e6dafb71e82' into glitch-soc/merge-upstream

2024-02-26 17:43:16 +01:00

flavours

[Glitch] Remove unused media-spoiler-* JS/CSS

2024-02-26 17:54:58 +01:00

fonts

Merge commit '7f471e70c0e1cc106747634d20f173a68a9272d7' into glitch-soc/merge-upstream

2024-01-15 21:30:00 +01:00

hooks

…

icons

…

images

Merge commit '6936e5aa693ccc4aabd26ef18a65fbb8132f6f74' into glitch-soc/merge-upstream-composer

2024-02-22 20:58:41 +01:00

mastodon

Merge commit '6f7615ba86afda56e1d661442286a1d68467a525' into glitch-soc/merge-upstream

2024-02-27 19:20:57 +01:00

material-icons

[Glitch] Fix pixel alignment for some composer icons

2024-02-24 15:53:42 +01:00

packs

Remove unused media-spoiler-* JS/CSS (#29407)

2024-02-26 15:30:58 +00:00

skins

…

styles

Merge commit '6f7615ba86afda56e1d661442286a1d68467a525' into glitch-soc/merge-upstream

2024-02-27 19:20:57 +01:00

svg-icons

Use active variants for boost icons and increase icon size (#27924)

2024-01-24 12:37:43 +00:00

types

Change icon SVG imports to use a default import (#28709)

2024-01-12 10:31:24 +00:00