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 d8fdbb054e Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/validators/status_length_validator.rb`: Upstream changes too close to glitch-soc MAX_CHARS changes, but not a real conflict. Applied upstream changes. - `package.json`: glitch-soc-only dependency textually too close to a dependency updated upstream, not a real conflict. Applied upstream changes.		4 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	4 years ago
show.html.haml	Fix some account avatars on public pages having incorrect size (#13692)	5 years ago
terms.html.haml	Update /terms and /about/more to use public layout (#8142)	6 years ago