Claire d1780fb9a4 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/ISSUE_TEMPLATE/bug_report.md`: Removed upstream, while we had a checkbox telling people to check if the issue was present upstream. Removed the file as well.		2021-06-30 00:42:52 +02:00
..
about	Merge branch 'main' into glitch-soc/merge-upstream	2021-03-02 12:06:58 +01:00
accounts	Merge branch 'main' into glitch-soc/merge-upstream	2021-05-07 18:21:59 +02:00
admin	Merge branch 'main' into glitch-soc/merge-upstream	2021-05-07 18:21:59 +02:00
admin_mailer
application
auth	Merge branch 'main' into glitch-soc/merge-upstream	2021-06-23 10:46:24 +02:00
authorize_interactions
directories
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
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
oauth
public_timelines
relationships
remote_follow
remote_interaction
settings	Merge branch 'main' into glitch-soc/merge-upstream	2021-06-24 08:08:02 +02:00
shared
shares
statuses	Merge branch 'main' into glitch-soc/merge-upstream	2021-05-07 18:21:59 +02:00
tags
user_mailer	Fix missing source strings and inconsistent lead text style in admin UI (#16052)	2021-04-17 11:12:49 +02:00
well_known/host_meta