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

Conflicts: - `README.md`: Upstream added some text, but our README is completely different. Kept our README unchanged.
2022-01-16 18:11:20 +01:00
parent 07cb948f39 462bc65112
commit b61c3ddff8
24 changed files with 151 additions and 84 deletions
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -127,7 +127,6 @@ class Account < ApplicationRecord

  delegate :email,
           :unconfirmed_email,
-           :current_sign_in_ip,
           :current_sign_in_at,
           :created_at,
           :sign_up_ip,