diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2018-12-14 12:09:55 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2018-12-14 12:09:55 +0300 |
| commit | f81213910fb32505b92fc19270cc483e00862d0c (patch) | |
| tree | dd3847033e142e1fffe9dc17419a5b562149cbe1 /config | |
| parent | 9e689de06302df8b1d281c41f7774d43a0db3758 (diff) | |
| download | pleroma-f81213910fb32505b92fc19270cc483e00862d0c.tar.gz pleroma-f81213910fb32505b92fc19270cc483e00862d0c.zip | |
[#114] Addressed MR comments. Removed functionality to be extracted to other MRs.
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 2 | ||||
| -rw-r--r-- | config/dev.exs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config/config.exs b/config/config.exs index 410b3c618..1401b0a3d 100644 --- a/config/config.exs +++ b/config/config.exs @@ -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. diff --git a/config/dev.exs b/config/dev.exs index 166be721a..080a2f8db 100644 --- a/config/dev.exs +++ b/config/dev.exs @@ -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 |