Merge branch '114_email_invites' into 'develop'

[#114] Email invites

See merge request pleroma/pleroma!541

diff --cc config/config.md
Simple merge

diff --cc lib/pleroma/web/twitter_api/controllers/util_controller.ex
index a8e3467c46a0398bd6827b351d867a652f7ade46,fb3b99d25f55e3aa602e1635dc337635a58edc9f..2f2b69623d63474bd48f2784ef4eb34703396ae5
--- 1/lib/pleroma/web/twitter_api/controllers/util_controller.ex
--- 2/lib/pleroma/web/twitter_api/controllers/util_controller.ex
+++ b/lib/pleroma/web/twitter_api/controllers/util_controller.ex
@@@ -170,10 -164,10 +170,11 @@@ defmodule Pleroma.Web.TwitterAPI.UtilCo
            description: Keyword.get(instance, :description),
            server: Web.base_url(),
            textlimit: to_string(Keyword.get(instance, :limit)),
 +          uploadlimit: uploadlimit,
            closed: if(Keyword.get(instance, :registrations_open), do: "0", else: "1"),
            private: if(Keyword.get(instance, :public, true), do: "0", else: "1"),
-           vapidPublicKey: vapid_public_key
+           vapidPublicKey: vapid_public_key,
+           invitesEnabled: if(Keyword.get(instance, :invites_enabled, false), do: "1", else: "0")
          }
  
          pleroma_fe = %{