From f844386809e894591dce3f52ace4beba0c977a8b Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 23 Nov 2020 17:50:16 +0100
Subject: 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>
---
 app/models/account.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app/models/account.rb')

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,
-- 
cgit