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.		2020-12-15 14:27:06 +01:00
..
_domain_blocks.html.haml	Fix long domain block descriptions breaking table layout (#12029)	2019-10-01 04:54:29 +02:00
_login.html.haml	Fix duplicate HTML ids in /about (#11803)	2019-09-10 20:55:23 +02:00
_registration.html.haml	Add ability to require invite request text (#15326)	2020-12-14 10:03:09 +01:00
more.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	2020-12-15 14:27:06 +01:00
show.html.haml	Fix some account avatars on public pages having incorrect size (#13692)	2020-05-13 21:20:34 +02:00
terms.html.haml	Update /terms and /about/more to use public layout (#8142)	2018-08-09 12:58:20 +02:00