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
..
_domain_blocks.html.haml	Add option to obfuscate domain name in public list of domain blocks (#15355)	4 years ago
_login.html.haml	Fix duplicate HTML ids in /about (#11803)	5 years ago
_registration.html.haml	Add ability to require invite request text (#15326)	4 years ago
more.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
show.html.haml	Change number_to_human calls to always use 3-digits precision (#16469)	3 years ago
terms.html.haml	Update /terms and /about/more to use public layout (#8142)	6 years ago