Merge branch 'main' into glitch-soc/merge-upstream

2021-06-23 10:46:24 +02:00
parent a434f370f3 63b807cffc
commit 37fd9670a5
25 changed files with 762 additions and 677 deletions
--- a/app/controllers/follower_accounts_controller.rb
+++ b/app/controllers/follower_accounts_controller.rb
@@ -86,7 +86,7 @@ class FollowerAccountsController < ApplicationController
    if page_requested? || !@account.user_hides_network?
      # Return all fields
    else
-      %i(id type totalItems)
+      %i(id type total_items)
    end
  end
 end