summaryrefslogtreecommitdiff
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorkaniini <nenolod@gmail.com>2019-07-10 05:34:21 +0000
committerkaniini <nenolod@gmail.com>2019-07-10 05:34:21 +0000
commitd91231f0be2b2115b7e53aee8a07de6620d033d4 (patch)
tree32253756380f31002c726caa8782ab3e634d25c4 /CHANGELOG.md
parentb00620b378fea818bcbde49b70548a574b706796 (diff)
parent12b1454245fc2efba22d5633f65539dac727ee3d (diff)
downloadpleroma-d91231f0be2b2115b7e53aee8a07de6620d033d4.tar.gz
pleroma-d91231f0be2b2115b7e53aee8a07de6620d033d4.zip
Merge branch 'feature/disable_send_emails' into 'develop'
[#1062] added option to disable send email See merge request pleroma/pleroma!1389
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r--CHANGELOG.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 227f721e3..763cd8d92 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ Configuration: `federation_incoming_replies_max_depth` option
- Admin API: Return avatar and display name when querying users
- Admin API: Allow querying user by ID
- Added synchronization of following/followers counters for external users
+- Configuration: `enabled` option for `Pleroma.Emails.Mailer`, defaulting to `false`.
### Fixed
- Not being able to pin unlisted posts