Merge commit '7aba79ade9bfeb86105aa575bc7156acef78f7da' into glitch-soc/merge-upstream

Conflicts:
- `app/views/layouts/application.html.haml`:
  Conflict because of glitch-soc's theming system.
  Updated the line as upstream did.

lib/mastodon/cli/cache.rb

@@ -63,6 +63,7 @@ module Mastodon::CLI
         status_stat.replies_count    = status.replies.not_direct_visibility.count
         status_stat.reblogs_count    = status.reblogs.count
         status_stat.favourites_count = status.favourites.count
+        status_stat.quotes_count     = status.quotes.accepted.count
 
         status_stat.save if status_stat.changed?
       end