Claire 93912f0498 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/account.rb`: Conflict because we (glitch-soc) have disabled trending of posts without review. Discarded that upstream change. - `app/views/admin/settings/discovery/show.html.haml`: Just an extra setting in glitch-soc. Kept that extra setting.		2022-11-12 13:28:03 +01:00
..
accounts	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-10 09:36:47 +01:00
admin	…
announcements	…
apps	…
crypto	…
emails	…
featured_tags	…
filters	…
instances	…
lists	…
polls	…
push	…
statuses	…
timelines	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-10 09:36:47 +01:00
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	…
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	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-12 13:28:03 +01:00
streaming_controller.rb	…
suggestions_controller.rb	…
tags_controller.rb	Improve performance by avoiding regex construction (#20215)	2022-11-10 05:49:30 +01:00