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.

Daniel Wagner-Hall 2502ca7ac6 Merge branch 'master' into daniel/threepidinvites-2 ... Conflicts: specification/targets.yaml		9 years ago
..
_template.rst	Minor tweaks	9 years ago
content_repo.rst	Remove redundant info now we have the http api template. Minor tweaks to display of schema with no names but a type	9 years ago
end_to_end_encryption.rst	Flesh out feature profiles section	9 years ago
history_visibility.rst	Add room history visibility as a module.	9 years ago
instant_messaging.rst	Flesh out feature profiles section	9 years ago
presence.rst	Remove duplicate sentences from merge conflicts	9 years ago
push.rst	Linkify 'pushers'	9 years ago
receipts.rst	Merge branch 'master' into module-receipts	9 years ago
third_party_invites.rst	Review comments	9 years ago
typing_notifications.rst	Merge branch 'master' into module-typing2	9 years ago
voip_events.rst	Merge branch 'master' into module-voip	9 years ago