Claire 2b0410f903 Merge commit 'f7aab0cc2ff47337021d50ed52428abcb7a9b518' into glitch-soc/backports-4.3 ...

Conflicts:
- `app/helpers/application_helper.rb`:
  Upstream added a helper, while glitch-soc had extra helpers.
  Added upstream's helper.

2024-10-18 17:19:57 +02:00

..

__mocks__

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

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

entrypoints

Merge commit '24ef8255b3f9b44cb54f49bc78fe3382a7070b1a' into glitch-soc/merge-upstream

2024-09-12 20:05:08 +02:00

flavours

[Glitch] Fix only the first paragraph being displayed in some notifications

2024-10-16 12:45:06 +02:00

fonts

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

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

hooks

Update directory page options to use URL params (#31977)

2024-09-19 15:34:08 +00:00

icons

png optimization(loss less) (#19630)

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

images

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

2024-08-22 22:09:10 +02:00

mastodon

Merge commit 'f7aab0cc2ff47337021d50ed52428abcb7a9b518' into glitch-soc/backports-4.3

2024-10-18 17:19:57 +02:00

material-icons

Merge branch 'stable-4.3' into glitch-soc/backports-4.3

2024-10-05 20:45:05 +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 'f7aab0cc2ff47337021d50ed52428abcb7a9b518' into glitch-soc/backports-4.3

2024-10-18 17:19:57 +02:00

svg-icons

Change zoom icon in web UI (#29683)

2024-09-20 09:42:02 +00:00

types

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

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