Claire 50b430d9a2 Merge branch 'main' into glitch-soc/merge-upstream ... - `app/views/statuses/_simple_status.html.haml`: Small markup change in glitch-soc, on a line that has been modified by upstream. Ported upstream changes.		2021-05-07 18:21:59 +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
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	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-04-05 14:31:07 +02:00
media	Merge branch 'main' into glitch-soc/merge-upstream	2021-05-07 18:21:59 +02:00
notification_mailer
oauth
public_timelines	Merge branch 'main' into glitch-soc/merge-upstream	2021-01-21 16:51:12 +01:00
relationships
remote_follow
remote_interaction
settings	Merge branch 'main' into glitch-soc/merge-upstream	2021-03-15 11:26:59 +01:00
shared
shares
statuses	Merge branch 'main' into glitch-soc/merge-upstream	2021-05-07 18:21:59 +02:00
tags	Merge branch 'main' into glitch-soc/merge-upstream	2021-01-21 16:51:12 +01:00
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