diff options
| author | Roman Chvanikov <chvanikoff@gmail.com> | 2019-04-14 14:05:21 +0700 |
|---|---|---|
| committer | Roman Chvanikov <chvanikoff@gmail.com> | 2019-04-14 14:05:21 +0700 |
| commit | 0cd4b6024d043efb096a353d6bd84ea0aeb74a6f (patch) | |
| tree | 359bbd63d213dbbf4c798a86e8804eaf6f047234 /lib/pleroma/web/twitter_api/twitter_api.ex | |
| parent | 371a4aed2ca9f6926e49f6791c8b4d14292d20e5 (diff) | |
| parent | 7304e0ce18776d4ace969a8a1b737a60635376d6 (diff) | |
| download | pleroma-0cd4b6024d043efb096a353d6bd84ea0aeb74a6f.tar.gz | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email
Diffstat (limited to 'lib/pleroma/web/twitter_api/twitter_api.ex')
| -rw-r--r-- | lib/pleroma/web/twitter_api/twitter_api.ex | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex index 9e9a46cf1..d6ce0a7c6 100644 --- a/lib/pleroma/web/twitter_api/twitter_api.ex +++ b/lib/pleroma/web/twitter_api/twitter_api.ex @@ -4,10 +4,10 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do alias Pleroma.Activity - alias Pleroma.Mailer + alias Pleroma.Emails.Mailer + alias Pleroma.Emails.UserEmail alias Pleroma.Repo alias Pleroma.User - alias Pleroma.UserEmail alias Pleroma.UserInviteToken alias Pleroma.Web.ActivityPub.ActivityPub alias Pleroma.Web.CommonAPI |