Claire 18556d3e9b Merge commit '98237207e67697abffc6b141f2388e3d8c925260' into glitch-soc/merge-upstream ...

Conflicts:
- `app/helpers/application_helper.rb`:
  Upstream refactored some helpers and moved them in another file.
  Not a real conflict, but glitch-soc had adjacent glitch-only definitions.
  Kept glitch-soc definitions where they are and moved upstream ones
  as upstream did.

2024-08-22 19:54:20 +02:00

..

__mocks__

…

entrypoints

[Glitch] Remove font-awesome npm package

2024-08-20 18:49:56 +02:00

flavours

[Glitch] Remove dead CSS code

2024-08-21 20:33:39 +02:00

fonts

…

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 '98237207e67697abffc6b141f2388e3d8c925260' into glitch-soc/merge-upstream

2024-08-22 19:54:20 +02:00

material-icons

Merge commit '9ba7c90151463a6e4f7952317253fe8c113e9b0a' into glitch-soc/merge-upstream

2024-08-20 18:31:50 +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 '98237207e67697abffc6b141f2388e3d8c925260' into glitch-soc/merge-upstream

2024-08-22 19:54:20 +02:00

svg-icons

…

types

…