diff options
author | Richard van der Hoff <richard@matrix.org> | 2019-10-29 14:22:58 +0000 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2019-10-29 14:22:58 +0000 |
commit | 954506aa7d3ecc9b92af09aa2a994b616cf2fe56 (patch) | |
tree | b149d7b880f6ad5eb122553e6b29e14f9d2b69c7 /CONTRIBUTING.rst | |
parent | Fix changelog name (diff) | |
parent | Update UPGRADE.rst (diff) | |
download | synapse-954506aa7d3ecc9b92af09aa2a994b616cf2fe56.tar.xz |
Merge remote-tracking branch 'origin/master' into release-v1.5.0
Diffstat (limited to 'CONTRIBUTING.rst')
-rw-r--r-- | CONTRIBUTING.rst | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 620dc88ce2..a71a4a696b 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -114,17 +114,6 @@ directory, you will need both a regular newsfragment *and* an entry in the debian changelog. (Though typically such changes should be submitted as two separate pull requests.) -Attribution -~~~~~~~~~~~ - -Everyone who contributes anything to Matrix is welcome to be listed in the -AUTHORS.rst file for the project in question. Please feel free to include a -change to AUTHORS.rst in your pull request to list yourself and a short -description of the area(s) you've worked on. Also, we sometimes have swag to -give away to contributors - if you feel that Matrix-branded apparel is missing -from your life, please mail us your shipping address to matrix at matrix.org and -we'll try to fix it :) - Sign off ~~~~~~~~ |