Daniel Wagner-Hall 2502ca7ac6 Merge branch 'master' into daniel/threepidinvites-2 ... Conflicts: specification/targets.yaml		2015-10-12 18:11:01 +01:00
..
modules	Merge branch 'master' into daniel/threepidinvites-2	2015-10-12 18:11:01 +01:00
0-event_signing.rst	Rename spec files to not have numbers everywhere; update targets.yaml	2015-09-22 14:01:55 +01:00
0-events.rst	Fix typo	2015-09-23 11:30:07 +01:00
0-feature_profiles.rst	Rename to 'Managing history visibility'	2015-10-01 09:23:08 +01:00
0-intro.rst	Merge pull request #74 from matrix-org/module-presence	2015-10-02 16:24:53 +01:00
1-client_server_api.rst	CS API is not just v1 surely	2015-10-06 09:38:46 -05:00
2-modules.rst	Various review fixes	2015-09-22 16:59:49 +01:00
3-application_service_api.rst	fix barefaced lie regarding the passivity of ASes	2015-10-06 14:13:40 -05:00
4-server_server_api.rst	Fix paragraph CSS and adjust where paragraphs are in the RST	2015-09-30 10:43:02 +01:00
5-identity_servers.rst	Rename spec files to not have numbers everywhere; update targets.yaml	2015-09-22 14:01:55 +01:00
6-appendices.rst	Rename spec files to not have numbers everywhere; update targets.yaml	2015-09-22 14:01:55 +01:00
targets.yaml	Merge branch 'master' into daniel/threepidinvites-2	2015-10-12 18:11:01 +01:00