Claire 7782e4dc0d Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/about_controller.rb`: Minor conflict caused by glitch-soc's theming system. Ported upstream changes.		2020-12-10 09:41:49 +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 honeypot fields and minimum fill-out time for sign-up form (#15276)	2020-12-10 06:27:26 +01:00
more.html.haml	Add subresource integrity for JS and CSS assets (#15096)	2020-11-06 11:56:31 +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