Mark Haines 24c4b8b095 Merge branch 'markjh/room_tags' into markjh/client_config ... Conflicts: api/client-server/v1/rooms.yaml api/client-server/v1/sync.yaml api/client-server/v2_alpha/sync.yaml specification/targets.yaml		2015-11-18 15:30:16 +00:00
..
modules	Merge branch 'markjh/room_tags' into markjh/client_config	2015-11-18 15:30:16 +00:00
appendices.rst	Spell 'cryptographic' correctly	2015-10-19 18:29:37 +01:00
application_service_api.rst	Merge branch 'master' into appservice-swagger	2015-10-21 09:55:53 +01:00
client_server_api.rst	Specify /publicRooms	2015-11-11 11:39:40 +00:00
event_signing.rst	Fix typo s/he/the/	2015-10-19 17:44:09 +01:00
events.rst	Mention that sender is renamed to user_id in v1	2015-10-29 18:45:53 +00:00
feature_profiles.rst	Merge remote-tracking branch 'origin/master' into erikj/search_actual	2015-10-19 13:46:58 +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	Use 'room' or 'room ID' instead of 'context' when describing federation protocol	2015-10-28 14:49:50 +00:00
targets.yaml	Merge branch 'master' into markjh/room_tags	2015-11-16 16:56:35 +00:00