Kegan Dougal f95d19cecd Merge branch 'master' into appservice-swagger ... Conflicts: specification/application_service_api.rst		2015-10-21 09:55:53 +01:00
..
modules	Merge pull request #114 from matrix-org/daniel/3pidtosigned	2015-10-19 15:52:50 +01:00
appendices.rst	Kill number prefixes for good	2015-10-15 13:40:05 +01:00
application_service_api.rst	Merge branch 'master' into appservice-swagger	2015-10-21 09:55:53 +01:00
client_server_api.rst	Allow rejecting invitations	2015-10-20 11:08:22 +01:00
event_signing.rst	Fix typo s/he/the/	2015-10-19 17:44:09 +01:00
events.rst	Merge branch 'master' into proofing	2015-10-16 15:23:07 +01:00
feature_profiles.rst	Merge branch 'master' into spec-182-asapi-user-creation	2015-10-19 13:39:21 +01:00
identity_servers.rst	Kill number prefixes for good	2015-10-15 13:40:05 +01:00
intro.rst	Merge branch 'master' into proofing	2015-10-16 15:23:07 +01:00
modules.rst	Kill number prefixes for good	2015-10-15 13:40:05 +01:00
server_server_api.rst	Kill number prefixes for good	2015-10-15 13:40:05 +01:00
targets.yaml	Kill number prefixes for good	2015-10-15 13:40:05 +01:00