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 e4f8679eae Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/models/form/admin_settings.rb`: New setting added upstream. Ported it. - `app/views/statuses/_simple_status.html.haml`: Upstream removed RTL classes. Did the same. - `config/settings.yml`: New setting added upstream. Ported it.		4 years ago
..
_domain_blocks.html.haml	…
_login.html.haml	…
_registration.html.haml	Add ability to require invite request text (#15326)	4 years ago
more.html.haml	Merge branch 'master' 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	…