This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

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.		2021-07-08 16:17:19 +02:00
..
_domain_blocks.html.haml	Add option to obfuscate domain name in public list of domain blocks (#15355)	2020-12-18 08:30:41 +01:00
_login.html.haml	…
_registration.html.haml	Add ability to require invite request text (#15326)	2020-12-14 10:03:09 +01:00
more.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	2021-07-08 16:17:19 +02:00
show.html.haml	Change number_to_human calls to always use 3-digits precision (#16469)	2021-07-07 21:13:08 +02:00
terms.html.haml	…