diff options
| author | lambda <lain@soykaf.club> | 2019-04-12 10:41:09 +0000 |
|---|---|---|
| committer | lambda <lain@soykaf.club> | 2019-04-12 10:41:09 +0000 |
| commit | 184ae60b217f4e3a79aad538717d1cf35f10291a (patch) | |
| tree | ce7633ae3f388e1cf7618d39512a196ec59c93f3 /lib/pleroma/web/twitter_api/twitter_api.ex | |
| parent | 0a09692c7decdcaa8c15e5f8eaf10d9e7d16a5e5 (diff) | |
| parent | 9c1b36856b97a7f86e60ad23ef374449c1910c7a (diff) | |
| download | pleroma-184ae60b217f4e3a79aad538717d1cf35f10291a.tar.gz | |
Merge branch 'bugfix/pleroma-email-naming' into 'develop'
Make the filename and module name of Pleroma.Emails.* orthogonal
See merge request pleroma/pleroma!1029
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 |