Thibaut Girka 2d8be0a6e1 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- `.env.production.sample`:
  Upstream changed it completely.
  Changed ours to merge upstream's new structure, but
  keeping most of the information.

2020-07-05 19:35:56 +02:00

..

_attachment_list.html.haml

…

_detailed_status.html.haml

Add color extraction for audio thumbnails (#14209)

2020-07-05 18:28:25 +02:00

_og_description.html.haml

…

_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-07-05 19:35:56 +02:00

_status.html.haml

…

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