Claire c79a03b319 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream changed their README, we have a completely different one. Kept our README.		2022-03-15 20:45:27 +01:00
..
about	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-08 20:22:54 +01:00
accounts
admin	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-15 20:45:27 +01:00
admin_mailer	Add trending statuses (#17431)	2022-02-25 00:34:14 +01:00
application	Add trending statuses (#17431)	2022-02-25 00:34:14 +01:00
auth	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-02 18:02:48 +01:00
authorize_interactions
directories	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-08 20:22:54 +01:00
disputes/strikes	Change how changes to media attachments are stored for edits (#17696)	2022-03-09 09:06:17 +01:00
errors
filters
follower_accounts	Add /api/v1/accounts/familiar_followers to REST API (#17700)	2022-03-07 09:36:47 +01:00
following_accounts	Add /api/v1/accounts/familiar_followers to REST API (#17700)	2022-03-07 09:36:47 +01:00
home
invites
kaminari
layouts	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-02 18:02:48 +01:00
media
notification_mailer	Change how changes to media attachments are stored for edits (#17696)	2022-03-09 09:06:17 +01:00
oauth	Change visual separation of applications in authorized apps list (#17686)	2022-03-02 20:28:25 +01:00
public_timelines
relationships
remote_follow
remote_interaction
settings	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-08 20:22:54 +01:00
shared
shares
statuses	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-15 20:45:27 +01:00
statuses_cleanup
tags
user_mailer	Change text version of warning mail to mention appeals instead of mails (#17725)	2022-03-09 12:11:11 +01:00
well_known/host_meta