Merge branch 'master' into travis/spec/is-auth

This commit is contained in:
Travis Ralston 2019-09-03 14:03:34 -06:00
commit 8f48b4e717
4 changed files with 94 additions and 3 deletions

View file

@ -79,7 +79,7 @@ their proposed changes to the Matrix protocol:
* Pragmatism rather than perfection
* Proof rather than conjecture
Please see [MSC1779](https://github.com/matrix-org/matrix-doc/blob/matthew/msc1779/proposals/1779-open-governance.md)
Please `see MSC1779 <https://github.com/matrix-org/matrix-doc/blob/master/proposals/1779-open-governance.md>`_
for full details of the project's Guiding Principles.
Technical notes