summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2016-04-19 12:09:43 -0400
committerKali Kaneko <kali@leap.se>2016-04-19 12:09:43 -0400
commitca2e16bb9fbef938bc17b232e801d484d9602ec4 (patch)
tree64322cff224b13d030391bcf2927598b007ab460
parent5b90ad3552025436edb40665203ab98eceaa065b (diff)
[docs] add email prefs to changelog
-rw-r--r--changes/feature-7552_mail-help-message-on-ui1
-rw-r--r--changes/feature-email-preferences-panel1
-rw-r--r--changes/next-changelog.rst1
3 files changed, 1 insertions, 2 deletions
diff --git a/changes/feature-7552_mail-help-message-on-ui b/changes/feature-7552_mail-help-message-on-ui
deleted file mode 100644
index 44ab8fa7..00000000
--- a/changes/feature-7552_mail-help-message-on-ui
+++ /dev/null
@@ -1 +0,0 @@
-- Add UI message to help new mail users to get started. Closes feature #7552.
diff --git a/changes/feature-email-preferences-panel b/changes/feature-email-preferences-panel
deleted file mode 100644
index e9bbfb6a..00000000
--- a/changes/feature-email-preferences-panel
+++ /dev/null
@@ -1 +0,0 @@
-- Add email panel to preferences window. \ No newline at end of file
diff --git a/changes/next-changelog.rst b/changes/next-changelog.rst
index 4f09b291..ca74746f 100644
--- a/changes/next-changelog.rst
+++ b/changes/next-changelog.rst
@@ -16,6 +16,7 @@ Features
- `#6041 <https://leap.se/code/issues/6041>`_: Write service tokens to a file to allow email clients to read them from there.
- Use cred-based authentication on SMTP.
- Experimental support for the Pixelated WebMail.
+- Add email panel to preferences window.
- Ability to launch detached bitmask.core daemon, and a simplistic bitmask_cli. Not used by the main client yet.
- `#1234 <https://leap.se/code/issues/1234>`_: Description of the new feature corresponding with issue #1234.