mastodon/app/views/statuses
Thibaut Girka 45709d6987 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.
2020-01-20 15:00:22 +01:00
..
_attachment_list.html.haml
_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
_og_image.html.haml
_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/master 2020-01-20 15:00:22 +01: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