Thibaut Girka 41a98b6543 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - README.md - app/helpers/statuses_helper.rb Upstream moved account helpers to their own file, we had extra helpers there, moved too. - app/lib/sanitize_config.rb - app/models/user.rb - app/serializers/initial_state_serializer.rb - config/locales/simple_form.en.yml - spec/lib/sanitize_config_spec.rb		2019-10-27 12:14:01 +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	Fix duplicate HTML ids in /about (#11803)	2019-09-10 20:55:23 +02:00
more.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	2019-09-30 12:23:57 +02:00
show.html.haml	Add noopener and/or noreferrer (#12202)	2019-10-24 22:44:42 +02:00
terms.html.haml	Update /terms and /about/more to use public layout (#8142)	2018-08-09 12:58:20 +02:00