Mastodon

0 Fork 0

Files

T

Claire b3bae7e78f Merge commit '3473b8a65278783bc74ce2738aea98cca0c7a5ed' into glitch-soc/merge-upstream

Conflicts:
- `config/settings.yml`:
  Upstream added a new setting textually adjacent to ones modified by glitch-soc's.
  Added upstream's new setting.

2026-04-25 09:20:39 +02:00

account_actions

…

account_warnings

…

accounts

…

action_logs

…

announcements

…

change_emails

…

collections

Use /collections/:id as canonical URL for a collection (#38783 )

2026-04-23 07:36:35 +00:00

custom_emojis

…

dashboard

…

disputes/appeals

…

domain_allows

…

domain_blocks

…

email_domain_blocks

…

export_domain_allows

…

export_domain_blocks

…

fasp

…

follow_recommendations

…

instances

…

invites

…

ip_blocks

Use model constants more consistently for view expiration collections (#38589 )

2026-04-17 13:57:18 +00:00

relationships

…

relays

…

report_notes

…

reports

…

roles

Add per-user maximum number of collections (#38769 )

2026-04-22 12:34:08 +00:00

rules

…

settings

Merge commit '3473b8a65278783bc74ce2738aea98cca0c7a5ed' into glitch-soc/merge-upstream

2026-04-25 09:20:39 +02:00

shared

Use /collections/:id as canonical URL for a collection (#38783 )

2026-04-23 07:36:35 +00:00

software_updates

…

status_edits

…

statuses

…

system_check/messages

…