Daniel Wagner-Hall 2502ca7ac6 Merge branch 'master' into daniel/threepidinvites-2 ... Conflicts: specification/targets.yaml		2015-10-12 18:11:01 +01:00
..
_template.rst	Minor tweaks	2015-09-28 14:07:34 +01:00
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	2015-10-02 10:44:50 +01:00
end_to_end_encryption.rst	Flesh out feature profiles section	2015-09-25 15:09:15 +01:00
history_visibility.rst	Add room history visibility as a module.	2015-09-29 16:33:34 +01:00
instant_messaging.rst	Flesh out feature profiles section	2015-09-25 15:09:15 +01:00
presence.rst	Remove duplicate sentences from merge conflicts	2015-10-02 16:24:33 +01:00
push.rst	Linkify 'pushers'	2015-10-12 17:50:46 +01:00
receipts.rst	Merge branch 'master' into module-receipts	2015-10-01 15:44:53 +01:00
third_party_invites.rst	Review comments	2015-10-12 18:08:51 +01:00
typing_notifications.rst	Merge branch 'master' into module-typing2	2015-10-01 15:47:46 +01:00
voip_events.rst	Merge branch 'master' into module-voip	2015-10-01 15:48:42 +01:00