Claire 1f796d129d Merge commit '598ae4f2da86029b1c3c3e35e64b89873037b598' into glitch-soc/merge-upstream ...

Conflicts:
- `config/routes/api.rb`:
  Upstream added an endpoint, textually close to a glitch-soc-only endpoint.
  Ported upstream changes.

2024-07-30 20:47:34 +02:00

..

__mocks__

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

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

entrypoints

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

2024-07-23 19:31:23 +02:00

flavours

[Glitch] Implement UI for Admin Search of Hashtags

2024-07-29 19:21:04 +02:00

fonts

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

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

hooks

Change hover cards to not appear until the mouse stops in web UI (#30850)

2024-07-01 15:52:01 +00:00

icons

…

images

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

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

mastodon

Merge commit '598ae4f2da86029b1c3c3e35e64b89873037b598' into glitch-soc/merge-upstream

2024-07-30 20:47:34 +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 '1229d2907a4a7ee09ee42cd24043d74561507e0a' into glitch-soc/merge-upstream

2024-07-29 19:16:58 +02: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