OpenCloud
/
mastodon
mirror of https://github.com/tootsuite/mastodon
1
1
Fork 0
Code Issues Releases Wiki Activity
mastodon/app/views/statuses
History
Claire 3160e050a9 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/accounts_helper.rb`:
  Conflict due to upstream changing how followers count is displayed while we
  have an option to hide followers count.
  Ported upstream change.
- `app/views/accounts/_header.html.haml`:
  Conflict due to upstream changing how followers count is displayed while we
  have an option to hide followers count.
  Ported upstream change.
- `app/views/directories/index.html.haml`:
  Conflict due to upstream changing how followers count is displayed while we
  have an option to hide followers count.
  Ported upstream change.
 		2021-07-08 16:17:19 +02:00
..
_attachment_list.html.haml
…
_detailed_status.html.haml Change number_to_human calls to always use 3-digits precision (#16469) 2021-07-07 21:13:08 +02:00
_og_description.html.haml
…
_og_image.html.haml
…
_poll.html.haml Fix error when trying to render component for media without meta (#16112) 2021-05-05 21:16:55 +02:00
_simple_status.html.haml Merge branch 'main' into glitch-soc/merge-upstream 2021-05-07 18:21:59 +02:00
_status.html.haml Fix error when trying to render component for media without meta (#16112) 2021-05-05 21:16:55 +02:00
embed.html.haml Fix error when trying to render component for media without meta (#16112) 2021-05-05 21:16:55 +02:00
show.html.haml add og:published_time to opengraph meta tags (#14865) 2020-09-24 23:32:13 +02:00