summary refs log tree commit diff
path: root/CONTRIBUTING.rst
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-10-29 15:51:12 +0000
committerErik Johnston <erik@matrix.org>2019-10-29 15:51:12 +0000
commit307e313ef4704ab3c8aeccad9e37f0f62fb89862 (patch)
treee16830e7325dc2d71029020e9b51cfce3af3de2f /CONTRIBUTING.rst
parentNewsfile (diff)
parentFix CI for synapse_port_db (#6276) (diff)
downloadsynapse-307e313ef4704ab3c8aeccad9e37f0f62fb89862.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/port_rest_events
Diffstat (limited to 'CONTRIBUTING.rst')
-rw-r--r--CONTRIBUTING.rst11
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 ~~~~~~~~