Claire 30ee7339d3 Merge commit '7d9b209fe84b00eff348ea9d54905cbfffa79788' into glitch-soc/merge-upstream ... Conflicts: - `app/models/form/admin_settings.rb`: Upstream changed code style change, including on a line modified by glitch-soc. Kept glitch-soc's line but with the code style change applied.		2023-12-21 19:31:12 +01:00
..
accounts	…
admin	…
announcements	…
apps	…
crypto	…
emails	…
featured_tags	…
instances	…
lists	…
peers	…
polls	…
profile	…
push	…
statuses	…
timelines	…
trends	…
accounts_controller.rb	…
announcements_controller.rb	…
apps_controller.rb	…
blocks_controller.rb	…
bookmarks_controller.rb	…
conversations_controller.rb	…
custom_emojis_controller.rb	…
directories_controller.rb	…
domain_blocks_controller.rb	…
endorsements_controller.rb	…
favourites_controller.rb	…
featured_tags_controller.rb	…
filters_controller.rb	…
follow_requests_controller.rb	…
followed_tags_controller.rb	…
instances_controller.rb	…
invites_controller.rb	…
lists_controller.rb	…
markers_controller.rb	…
media_controller.rb	…
mutes_controller.rb	…
notifications_controller.rb	…
polls_controller.rb	…
preferences_controller.rb	…
reports_controller.rb	…
scheduled_statuses_controller.rb	…
statuses_controller.rb	…
streaming_controller.rb	…
suggestions_controller.rb	…
tags_controller.rb	…