Merge branch '114_email_invites' into 'develop'
authorhref <href+git-pleroma@random.sh>
Fri, 14 Dec 2018 20:22:24 +0000 (20:22 +0000)
committerhref <href+git-pleroma@random.sh>
Fri, 14 Dec 2018 20:22:24 +0000 (20:22 +0000)
commitbfe27c1b557b19c171c8168c5f1244987246c47f
treef2dad70a4920f927f470157ad2eb53382a81ed03
parentacec11626d2bb61c3728d634b04ac5afeaf4b17b
parent69fd63e248d39cf2e10657646bc11e9e559e6e45
Merge branch '114_email_invites' into 'develop'

[#114] Email invites

See merge request pleroma/pleroma!541
config/config.md
lib/pleroma/web/twitter_api/controllers/util_controller.ex