mastodon/app/views/accounts
Claire 15929a3d59 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  Our README is completely different. Discarded upstream changes.
- `app/javascript/packs/mailer.js`:
  We had removed the file. Move the changes to `app/javascript/core/mailer.js`.
2022-06-11 00:08:41 +02:00
..
_bio.html.haml Refactor account and status formatting (#17877) 2022-03-28 01:17:17 +02:00
_header.html.haml Merge branch 'main' into glitch-soc/merge-upstream 2021-07-08 16:17:19 +02:00
_moved.html.haml Fix IDN domains not being rendered correctly in a few left-over places (#17848) 2022-03-22 10:07:11 +01:00
_og.html.haml Fix various issues around OpenGraph representation of media (#14133) 2020-06-25 01:33:01 +02:00
show.html.haml Change number_to_human calls to always use 3-digits precision (#16469) 2021-07-07 21:13:08 +02:00
show.rss.ruby Change brand color and logotypes (#18592) 2022-06-09 22:25:23 +02:00