You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Erik Johnston 8e6c8ba59e Merge branch 'master' of github.com:matrix-org/matrix-doc into erikj/spec_3pid_ruls		6 years ago
..
appendices	Merge pull request #1588 from matrix-org/rav/fix_server_name	6 years ago
modules	Remove references to initialSync from account data and receipts module	6 years ago
appendices.rst	Split appendices up	8 years ago
application_service_api.rst	Merge pull request #1628 from turt2live/travis/as/external_url	6 years ago
client_server_api.rst	Merge pull request #1359 from uhoreg/well-known	6 years ago
events.rst	fix inter-spec link	7 years ago
feature_profiles.rst	Third party lookup module. Fix wording	6 years ago
identity_service_api.rst	Merge pull request #1557 from turt2live/travis/general/r0-prep	6 years ago
index.rst	avoid .rst link conflict warnings	6 years ago
modules.rst	Add a license to the spec	8 years ago
proposals.rst	Use $ref, clean up, fix errors, AS is now a C-S module.	6 years ago
proposals_intro.rst	Add more strength to the suggestion to find existing issues	6 years ago
push_gateway.rst	Revert "Take out the reference to the current version from the changelog"	6 years ago
server_server_api.rst	Merge branch 'master' of github.com:matrix-org/matrix-doc into erikj/spec_3pid_ruls	6 years ago
targets.yaml	Merge remote matrix-org/master	6 years ago