Thibaut Girka 9adeaf2bfc Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/statuses_controller.rb`: Minor conflict due to theming system		2020-01-24 14:37:06 +01:00
..
_bio.html.haml
_header.html.haml
_moved.html.haml	Add noopener and/or noreferrer (#12202)	2019-10-24 22:44:42 +02:00
_og.html.haml
show.html.haml	Fix duplicate “description” meta tag on accounts public pages (#12923)	2020-01-22 16:26:23 +01:00