summary refs log tree commit diff
diff options
context:
space:
mode:
authorAmber Brown <hawkowl@atleastfornow.net>2018-08-03 04:40:18 +1000
committerGitHub <noreply@github.com>2018-08-03 04:40:18 +1000
commit8a86d7ea962c984aef373b628713692e92619c79 (patch)
treefc664dc58e1f17498018df4137e15b92c1444f9c
parentMerge pull request #3639 from matrix-org/rav/refactor_error_handling (diff)
parentnewsfragment (diff)
downloadsynapse-8a86d7ea962c984aef373b628713692e92619c79.tar.xz
Merge pull request #3645 from matrix-org/michaelkaye/mention_newsfragment
Mention the word "newsfragment" in CONTRIBUTING.rst
-rw-r--r--CONTRIBUTING.rst2
-rw-r--r--changelog.d/3645.misc1
2 files changed, 2 insertions, 1 deletions
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 6c295cfbfe..aa2738eea3 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -51,7 +51,7 @@ makes it horribly hard to review otherwise.
 Changelog
 ~~~~~~~~~
 
-All changes, even minor ones, need a corresponding changelog
+All changes, even minor ones, need a corresponding changelog / newsfragment
 entry. These are managed by Towncrier
 (https://github.com/hawkowl/towncrier).
 
diff --git a/changelog.d/3645.misc b/changelog.d/3645.misc
new file mode 100644
index 0000000000..0fe6b28da1
--- /dev/null
+++ b/changelog.d/3645.misc
@@ -0,0 +1 @@
+Update CONTRIBUTING to mention newsfragments.