Merge branch 'bugfix/pleroma-email-naming' into 'develop'
authorlambda <lain@soykaf.club>
Fri, 12 Apr 2019 10:41:09 +0000 (10:41 +0000)
committerlambda <lain@soykaf.club>
Fri, 12 Apr 2019 10:41:09 +0000 (10:41 +0000)
commit184ae60b217f4e3a79aad538717d1cf35f10291a
treece7633ae3f388e1cf7618d39512a196ec59c93f3
parent0a09692c7decdcaa8c15e5f8eaf10d9e7d16a5e5
parent9c1b36856b97a7f86e60ad23ef374449c1910c7a
Merge branch 'bugfix/pleroma-email-naming' into 'develop'

Make the filename and module name of Pleroma.Emails.* orthogonal

See merge request pleroma/pleroma!1029
lib/pleroma/user.ex
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/admin_api/admin_api_controller.ex
lib/pleroma/web/twitter_api/twitter_api.ex
test/web/admin_api/admin_api_controller_test.exs
test/web/twitter_api/twitter_api_test.exs