Thibaut Girka 01eaeab56d Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/application_controller.rb`: Conflict due to theming system. - `app/controllers/oauth/authorizations_controller.rb`: Conflict due to theming system.		2020-01-04 23:04:42 +01:00
..
_attachment_list.html.haml	Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247)	2019-07-07 16:16:51 +02:00
_detailed_status.html.haml	Add noopener and/or noreferrer (#12202)	2019-10-24 22:44:42 +02:00
_og_description.html.haml	Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247)	2019-07-07 16:16:51 +02:00
_og_image.html.haml	Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247)	2019-07-07 16:16:51 +02:00
_poll.html.haml	Add voters count support (#11917)	2019-09-29 22:58:01 +02:00
_simple_status.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	2019-10-27 12:14:01 +01:00
_status.html.haml	Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247)	2019-07-07 16:16:51 +02:00
embed.html.haml	Fix cache digesting log noise on status embeds (#12750)	2020-01-03 05:00:17 +01:00
show.html.haml	Prevent archiving when user set "noindex" (#11421)	2019-07-28 13:46:04 +02:00