[#114] Addressed MR comments. Removed functionality to be extracted to other MRs.

This commit is contained in:
Ivan Tashkinov 2018-12-14 12:09:55 +03:00
commit f81213910f
5 changed files with 2 additions and 12 deletions

View file

@ -101,8 +101,6 @@ config :pleroma, :instance,
finmoji_enabled: true,
mrf_transparency: true
config :pleroma, Pleroma.Mailer, adapter: Swoosh.Adapters.Local
config :pleroma, :markup,
# XXX - unfortunately, inline images must be enabled by default right now, because
# of custom emoji. Issue #275 discusses defanging that somehow.

View file

@ -17,6 +17,8 @@ config :pleroma, Pleroma.Web.Endpoint,
check_origin: false,
watchers: []
config :pleroma, Pleroma.Mailer, adapter: Swoosh.Adapters.Local
# ## SSL Support
#
# In order to use HTTPS in development, a self-signed