You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
mastodon/app/views/statuses
Claire 90528f43bc Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `config/webpack/configuration.js`:
  Upstream updated the `js-yaml` dependency, which changed how to call it.
  Those changes conflicted because that code is pretty different in glitch-soc
  which has to deal with its more complex theming system.
  Proceeded to the same compatibility changes in glitch-soc's code.
- `package.json` and `yarn.lock`:
  Not really a conflict, just glitch-soc-specific dependencies textually too
  close to some dependencies updated upstream.
5 years ago
..
_attachment_list.html.haml
_detailed_status.html.haml Fix expand video on public page (#15469) 5 years ago
_og_description.html.haml
_og_image.html.haml Fix various issues around OpenGraph representation of media (#14133) 6 years ago
_poll.html.haml Fix end-user-facing uses of inline CSS (#13438) 6 years ago
_simple_status.html.haml Merge branch 'master' into glitch-soc/merge-upstream 5 years ago
_status.html.haml Change public thread view to hide "Show thread" link (#15266) 5 years ago
embed.html.haml Fix cache digesting log noise on status embeds (#12750) 6 years ago
show.html.haml add og:published_time to opengraph meta tags (#14865) 5 years ago