mastodon-glitch/app/views/admin/follow_recommendations
Claire be493b6c0d Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/models/account.rb`:
  Not a real conflict, just upstream getting rid of unused constants too close
  to glitch-soc-specific contents.
  Removed unused constants like upstream did.
- `app/models/trends.rb`:
  Conflict because glitch-soc disabled email notifications for trending links.
  Upstream has refactored this quite a bit and added trending posts.
  Took upstream code, but disabling the extra trending stuff will come in
  another commit.
- `app/views/admin/trends/links/index.html.haml`:
  Conflict due to glitch-soc's theming system.
  Ported upstream changes accordingly.
2022-02-26 09:29:23 +01:00
..
_account.html.haml Change number_to_human calls to always use 3-digits precision (#16469) 2021-07-07 21:13:08 +02:00
show.html.haml Merge branch 'main' into glitch-soc/merge-upstream 2022-02-26 09:29:23 +01:00