You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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.		3 years ago
..
admin	Add management of delivery availability in Federation settings (#15771)	4 years ago
settings	…
accounts_helper.rb	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
application_helper.rb	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
domain_control_helper.rb	…
email_helper.rb	…
flashes_helper.rb	…
home_helper.rb	…
instance_helper.rb	…
jsonld_helper.rb	Fix trying to fetch key from empty URI when verifying HTTP signature (#16100)	4 years ago
mascot_helper.rb	…
routing_helper.rb	…
settings_helper.rb	New Crowdin updates (#16269)	4 years ago
statuses_helper.rb	Fix error when trying to render component for media without meta (#16112)	4 years ago
webfinger_helper.rb	…