Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
Richard van der Hoff 2017-02-07 21:46:08 +00:00
commit b080e5797b

View file

@ -1,4 +1,4 @@
Contributing code to Vector Contributing code to Riot
=========================== =========================
Vector follows the same pattern as https://github.com/matrix-org/synapse/blob/master/CONTRIBUTING.rst Riot follows the same pattern as https://github.com/matrix-org/synapse/blob/master/CONTRIBUTING.rst.