Claire 694c073d1f Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/admin/dashboard_controller.rb`: Upstream completely redesigned the admin dashboard. glitch-soc tracked extra features, but that list is gone. Followed upstram. - `app/views/admin/dashboard/index.html.haml` Upstream completely redesigned the admin dashboard. glitch-soc tracked extra features, but that list is gone. Followed upstram.		2021-10-14 21:44:57 +02:00
..
about	…
accounts	…
admin	Merge branch 'main' into glitch-soc/merge-upstream	2021-10-14 21:44:57 +02:00
admin_mailer	…
application	…
auth	…
authorize_interactions	…
directories	…
errors	…
filters	…
follower_accounts	…
following_accounts	…
home	…
invites	…
kaminari	…
layouts	…
media	…
notification_mailer	…
oauth	…
public_timelines	…
relationships	…
remote_follow	…
remote_interaction	…
settings	…
shared	…
shares	…
statuses	…
statuses_cleanup	…
tags	…
user_mailer	…
well_known/host_meta	…