Claire 3160e050a9 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/accounts_helper.rb`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change. - `app/views/accounts/_header.html.haml`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change. - `app/views/directories/index.html.haml`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change.		2021-07-08 16:17:19 +02: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-07-08 16:17:19 +02:00
admin	Merge branch 'main' into glitch-soc/merge-upstream	2021-07-08 16:17:19 +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	Merge branch 'main' into glitch-soc/merge-upstream	2021-07-08 16:17:19 +02:00
errors
filters
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	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-07-08 16:17:19 +02:00
shared
shares
statuses	Merge branch 'main' into glitch-soc/merge-upstream	2021-07-08 16:17:19 +02:00
tags	Merge branch 'main' into glitch-soc/merge-upstream	2021-01-21 16:51:12 +01:00
user_mailer
well_known/host_meta