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
..
_template.rst	Minor tweaks	2015-09-28 14:07:34 +01:00
anonymous_access.rst	Update 3pid spec based on new implementation	2015-11-05 18:11:20 +00:00
client_config.rst	Add a module for client config to the specification	2015-11-16 16:49:32 +00:00
content_repo.rst	Merge pull request #124 from matrix-org/clarify_scale_crop	2015-10-26 09:57:32 +00:00
end_to_end_encryption.rst	Flesh out feature profiles section	2015-09-25 15:09:15 +01:00
guest_access.rst	Merge pull request #161 from matrix-org/daniel/guestdisplaynames	2015-11-12 13:23:49 +00:00
history_visibility.rst	Allow history to be noted as world-readable	2015-10-23 14:02:53 +01:00
instant_messaging.rst	Add some links to spec bugs for display names	2015-11-05 11:06:31 +00:00
presence.rst	Fix list formatting so that we aren't including everything in blockquotes	2015-10-23 10:51:31 +01:00
push.rst	Fix list formatting so that we aren't including everything in blockquotes	2015-10-23 10:51:31 +01:00
receipts.rst	Merge branch 'master' into module-receipts	2015-10-01 15:44:53 +01:00
search.rst	Typo	2015-10-23 10:19:25 +01:00
tags.rst	s/private_user_data/account_data/	2015-11-18 15:27:26 +00:00
third_party_invites.rst	3pid invites: remove mentions of display_name	2015-11-09 17:30:18 +00:00
typing_notifications.rst	Merge branch 'master' into module-typing2	2015-10-01 15:47:46 +01:00
voip_events.rst	Fix list formatting so that we aren't including everything in blockquotes	2015-10-23 10:51:31 +01:00