summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2015-11-02 16:43:49 -0400
committerKali Kaneko <kali@leap.se>2015-11-02 16:47:41 -0400
commit526fe62df28694e7e7fb5f7a3371b97403a9fdee (patch)
tree1c8fbbc15e399b3aba26f9488352e0f8cb374466
parent4d872d604d1f24f370c727c94b0d5ac9352f3d19 (diff)
[pkg] merge previous feature file into new changelog format
-rw-r--r--changes/feature-7542_pin-mailbitmask1
-rw-r--r--changes/next-changelog.rst6
2 files changed, 6 insertions, 1 deletions
diff --git a/changes/feature-7542_pin-mailbitmask b/changes/feature-7542_pin-mailbitmask
deleted file mode 100644
index cd0930ff..00000000
--- a/changes/feature-7542_pin-mailbitmask
+++ /dev/null
@@ -1 +0,0 @@
-- Pin mail.bitmask.net provider. Closes feature #7542.
diff --git a/changes/next-changelog.rst b/changes/next-changelog.rst
index 37b950c5..ee5a3874 100644
--- a/changes/next-changelog.rst
+++ b/changes/next-changelog.rst
@@ -10,6 +10,7 @@ I've added a new category `Misc` so we can track doc/style/packaging stuff.
Features
~~~~~~~~
+- `#7542 <https://leap.se/code/issues/7542>`_: Pin mail.bitmask.net provider. Closes feature #7542.
- `#1234 <https://leap.se/code/issues/1234>`_: Description of the new feature corresponding with issue #1234.
- New feature without related issue number.
@@ -23,3 +24,8 @@ Misc
~~~~
- `#1236 <https://leap.se/code/issues/1236>`_: Description of the new feature corresponding with issue #1236.
- Some change without issue number.
+
+Known Issues
+~~~~~~~~~~~~
+
+- `#1236 <https://leap.se/code/issues/1236>`_: Description of the known issue corresponding with issue #1236.