Claire 443ec4f8ba Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/admin/tags/index.html.haml`: Removed upstream while it had changes in glitch-soc to accomodate for the theming system. Additional changes to accomodate for the theming system: - `app/views/admin/trends/links/preview_card_providers/index.html.haml` - `app/views/admin/trends/links/index.html.haml` - `app/views/admin/trends/tags/index.html.haml` - `app/views/admin/tags/show.html.haml`		2021-11-25 23:50:35 +01:00
..
admin	Add trending links (#16917)	2021-11-25 13:07:38 +01:00
settings	…
accounts_helper.rb	Merge branch 'main' into glitch-soc/merge-upstream	2021-07-08 16:17:19 +02:00
application_helper.rb	Merge branch 'main' into glitch-soc/merge-upstream	2021-10-14 21:44:57 +02:00
domain_control_helper.rb	…
email_helper.rb	…
flashes_helper.rb	…
home_helper.rb	…
instance_helper.rb	…
jsonld_helper.rb	…
languages_helper.rb	Add trending links (#16917)	2021-11-25 13:07:38 +01:00
mascot_helper.rb	…
routing_helper.rb	…
settings_helper.rb	Add trending links (#16917)	2021-11-25 13:07:38 +01:00
statuses_helper.rb	…
webfinger_helper.rb	…