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.

Daniel Wagner-Hall 2502ca7ac6 Merge branch 'master' into daniel/threepidinvites-2 ... Conflicts: specification/targets.yaml		9 years ago
..
modules	Merge branch 'master' into daniel/threepidinvites-2	9 years ago
0-event_signing.rst	Rename spec files to not have numbers everywhere; update targets.yaml	9 years ago
0-events.rst	Fix typo	9 years ago
0-feature_profiles.rst	Rename to 'Managing history visibility'	9 years ago
0-intro.rst	Merge pull request #74 from matrix-org/module-presence	9 years ago
1-client_server_api.rst	CS API is not just v1 surely	9 years ago
2-modules.rst	Various review fixes	9 years ago
3-application_service_api.rst	fix barefaced lie regarding the passivity of ASes	9 years ago
4-server_server_api.rst	Fix paragraph CSS and adjust where paragraphs are in the RST	9 years ago
5-identity_servers.rst	Rename spec files to not have numbers everywhere; update targets.yaml	9 years ago
6-appendices.rst	Rename spec files to not have numbers everywhere; update targets.yaml	9 years ago
targets.yaml	Merge branch 'master' into daniel/threepidinvites-2	9 years ago