Thibaut Girka 9c3b9d5ab9 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `.env.production.sample`: Upstream deleted it, I decided to keep it. - `package.json`: Upstream updated a dependency textually too close to wavesurfer.js which has been deleted from upstream but is kept in glitch-soc for now.		2020-06-30 23:00:20 +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	Add customizable thumbnails for audio and video attachments (#14145)	2020-06-29 13:56:55 +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	Fix various issues around OpenGraph representation of media (#14133)	2020-06-25 01:33:01 +02:00
_poll.html.haml	Fix end-user-facing uses of inline CSS (#13438)	2020-04-28 10:16:55 +02:00
_simple_status.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-30 23:00:20 +02: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