Mastodon

Files

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

Conflicts:
- `app/views/admin/reports/show.html.haml`:
  Conflicts due to glitch-soc's theming system.

2022-01-17 10:45:25 +01:00

about

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

2021-07-08 16:17:19 +02:00

accounts

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

2021-11-26 22:53:55 +01:00

admin

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

2022-01-17 10:45:25 +01:00

admin_mailer

Remove IP tracking columns from users table (#16409 )

2022-01-16 13:23:50 +01:00

application

Add trending links (#16917 )

2021-11-25 13:07:38 +01:00

auth

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

2021-06-23 10:46:24 +02:00

authorize_interactions

…

directories

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

2021-07-08 16:17:19 +02:00

errors

…

filters

Fix not being able to change world filter expiration back to “Never” (#15858 )

2021-03-12 05:25:50 +01:00

follower_accounts

…

following_accounts

…

home

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

2021-01-21 16:51:12 +01:00

invites

…

kaminari

…

layouts

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

2021-06-30 00:42:52 +02:00

media

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

2021-05-07 18:21:59 +02:00

notification_mailer

Add notifications for statuses deleted by moderators (#17204 )

2022-01-17 09:41:33 +01:00

oauth

…

public_timelines

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

2021-01-21 16:51:12 +01:00

relationships

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

2021-07-08 16:17:19 +02:00

remote_follow

…

remote_interaction

…

settings

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

2021-11-26 22:53:55 +01:00

shared

…

statuses

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

2021-07-08 16:17:19 +02:00

statuses_cleanup

Add feature to automatically delete old toots (#16529 )

2021-08-09 23:11:50 +02:00