Claire b4ed1e6c99 Merge commit '19bc3e76ea1d7fa2d9af711613a77fc0f5f0d1b5' into glitch-soc/main ...

Conflicts:
- `app/helpers/theme_helper.rb`:
  Upstream added a helper to insert javascript tags, close to where we had
  modified code.
  Ported upstream's change.

2026-01-13 18:30:48 +01:00

..

__mocks__

…

config

…

entrypoints

Updates Wrapstodon footer with dedicated local server info (#37270)

2025-12-16 15:35:26 +00:00

flavours

New Crowdin translations (#3335)

2026-01-10 19:47:20 +01:00

fonts

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

2025-12-10 18:05:44 +01:00

icons

…

images

Merge commit '4af8e83c8a236265c46a1b984fa5dbd3a7c73dfe' into glitch-soc/merge-upstream

2025-12-12 17:45:26 +01:00

inline

Add ability to include inline javascript (#37459)

2026-01-13 10:40:26 +00:00

mastodon

Merge commit '19bc3e76ea1d7fa2d9af711613a77fc0f5f0d1b5' into glitch-soc/main

2026-01-13 18:30:48 +01:00

material-icons

Merge commit '58b3fc03796dbde54dbba9a4c554c2d8d24f81fd' into glitch-soc/merge-upstream

2025-11-06 12:35:04 +01:00

skins

Remove unmaintained win95 theme

2025-12-02 21:06:16 +01:00

styles

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

2026-01-10 13:12:36 +01:00

svg-icons

…

testing

Emoji: Adds search (#37418)

2026-01-09 10:37:14 +00:00

types

Refactor carousel components (#36425)

2025-10-29 14:44:46 +00:00