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.

Mark Haines 5bae15d47b Merge branch 'master' into markjh/room_tags ... Conflicts: api/client-server/v2_alpha/sync.yaml		10 years ago
..
modules	s/private_user_data/account_data/	10 years ago
appendices.rst	Spell 'cryptographic' correctly	10 years ago
application_service_api.rst	Merge branch 'master' into appservice-swagger	10 years ago
client_server_api.rst	Swaggerify /rooms/:room_id/leave	10 years ago
event_signing.rst	Fix typo s/he/the/	10 years ago
events.rst	Unflatten 'unsigned'	10 years ago
feature_profiles.rst	Merge remote-tracking branch 'origin/master' into erikj/search_actual	10 years ago
identity_servers.rst	Kill number prefixes for good	10 years ago
intro.rst	Merge branch 'master' into proofing	10 years ago
modules.rst	Kill number prefixes for good	10 years ago
server_server_api.rst	Wording fix - objects contain keys, not list elements directly	10 years ago
targets.yaml	Merge branch 'master' into markjh/room_tags	10 years ago