Thibaut Girka 2f49575839 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: We have a different README than upstream, discarded upstream changes and kept ours.		2020-04-12 16:50:27 +02: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	Change reported media attachments to always be hidden in admin UI (#12879)	2020-01-18 19:50:43 +01: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	Fix styling of polls in JS-less fallback on public pages (#13436)	2020-04-07 18:21:58 +02:00
_simple_status.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	2020-02-03 09:22:58 +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	Fix punycode being rendered instead of unicode in some places (#13030)	2020-02-03 18:44:54 +01:00