Kegan Dougal 1520f3647f Merge branch 'master' into module-typing2 ... Conflicts: specification/modules/typing_notifications.rst		2015-10-01 15:47:46 +01:00
..
_template.rst	Minor tweaks	2015-09-28 14:07:34 +01:00
content_repo.rst	Merge pull request #65 from matrix-org/spec-feature-profiles	2015-10-01 12:16:30 +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	Flesh out feature profiles section	2015-09-25 15:09:15 +01:00
push_cs_api.rst	Fix paragraph CSS and adjust where paragraphs are in the RST	2015-09-30 10:43:02 +01:00
push_overview.rst	Flesh out feature profiles section	2015-09-25 15:09:15 +01:00
push_push_gw_api.rst	Rename spec files to not have numbers everywhere; update targets.yaml	2015-09-22 14:01:55 +01:00
receipts.rst	Flesh out feature profiles section	2015-09-25 15:09:15 +01:00
typing_notifications.rst	Merge branch 'master' into module-typing2	2015-10-01 15:47:46 +01:00
voip_events.rst	Merge pull request #65 from matrix-org/spec-feature-profiles	2015-10-01 12:16:30 +01:00