Claire 11dd51ef44 Merge commit '63ba69810eca80fc2d10114a79f2988c1b75892f' into glitch-soc/merge-upstream ...

Conflicts:
- `.env.production.sample`:
  Upstream and glitch-soc had different comments, some comments got updated upstream.
  Updated them in glitch-soc accordingly.

2024-07-06 21:02:42 +02:00

..

__mocks__

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

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

entrypoints

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

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

flavours

Revert "Temporarily disable hover cards"

2024-07-01 21:21:22 +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 '63ba69810eca80fc2d10114a79f2988c1b75892f' into glitch-soc/merge-upstream

2024-07-06 21:02:42 +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 '63ba69810eca80fc2d10114a79f2988c1b75892f' into glitch-soc/merge-upstream

2024-07-06 21:02:42 +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