Mastodon

Files

Claire 60abcb3c4c Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `config/i18n-tasks.yml`:
  Upstream added new ignored strings, glitch-soc has extra ignored strings
  because of the theming system.
  Added upstream's changes.

2023-01-18 17:38:11 +01:00

about

…

accounts

…

admin

Merge branch 'main' into glitch-soc/merge-upstream

2023-01-18 17:38:11 +01:00

admin_mailer

…

application

Fix style for hashes (#20518 )

2022-11-17 11:05:39 +01:00

auth

Merge branch 'main' into glitch-soc/merge-upstream

2022-12-15 20:25:25 +01:00

authorize_interactions

…

custom_css

…

disputes/strikes

Fix incorrectly formatted datetime in account moderation note timestamp (#22555 )

2023-01-05 13:35:28 +01:00

errors

…

filters

…

follower_accounts

…

following_accounts

…

home

…

invites

…

kaminari

…

layouts

Merge branch 'main' into glitch-soc/merge-upstream

2023-01-14 22:34:09 +01:00

media

…

notification_mailer

…

oauth

…

privacy

…

relationships

Merge branch 'main' into glitch-soc/merge-upstream

2023-01-14 22:34:09 +01:00

settings

Add links to glitch-soc's Crowdin (#2033 )

2022-12-21 23:49:08 +01:00

shared

…

statuses

Merge branch 'main' into glitch-soc/merge-upstream

2022-11-28 11:33:34 +01:00

statuses_cleanup

…