You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka 1f7e7594db Merge branch 'master' into glitch-soc/master ... Conflicts: - `README.md`: We have different README files. Discarded upstream changes. - `app/views/layouts/admin.html.haml`: Conflict due to glitch-soc theming system. Adapted upstream changes. - `app/views/layouts/embedded.html.haml`: Conflict due to glitch-soc theming system. Adapted upstream changes. - `yarn.lock`: No real conflict, glitch-specific dependency too close to an updated one. Adapted upstream change.		5 years ago
..
_attachment_list.html.haml	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	5 years ago
_detailed_status.html.haml	Change reported media attachments to always be hidden in admin UI (#12879)	5 years ago
_og_description.html.haml	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	5 years ago
_og_image.html.haml	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	5 years ago
_poll.html.haml	Add voters count support (#11917)	5 years ago
_simple_status.html.haml	Merge branch 'master' into glitch-soc/master	5 years ago
_status.html.haml	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	5 years ago
embed.html.haml	Fix cache digesting log noise on status embeds (#12750)	5 years ago
show.html.haml	Prevent archiving when user set "noindex" (#11421)	5 years ago