diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2020-11-23 17:50:16 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-23 17:50:16 +0100 |
commit | f844386809e894591dce3f52ace4beba0c977a8b (patch) | |
tree | fcb001ead34e9f3dc36da9072a0c25159bf0fdaf /app/models/account.rb | |
parent | a2da02626ef7a026dc7f6ec4219fbb839f4c2721 (diff) |
Add `tootctl accounts merge` (#15201)
* Add `tootctl accounts merge` * Update lib/mastodon/accounts_cli.rb Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
Diffstat (limited to 'app/models/account.rb')
-rw-r--r-- | app/models/account.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/account.rb b/app/models/account.rb index bc9bcc72d..f794d8a29 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -67,6 +67,7 @@ class Account < ApplicationRecord include Paginable include AccountCounters include DomainNormalizable + include AccountMerging TRUST_LEVELS = { untrusted: 0, |