Matthew Hodgson c3f29ea720 Merge branch 'master' into ua925_reshuffle		2015-03-23 15:36:36 +00:00
..
00_basis.rst	lots of fixes based on kegan's review of https://github.com/matrix-org/matrix-doc/pull/13	2015-03-19 14:21:08 +01:00
10_client_server_api.rst	lots of fixes based on kegan's review of https://github.com/matrix-org/matrix-doc/pull/13	2015-03-19 14:21:08 +01:00
20_events.rst	lots of fixes based on kegan's review of https://github.com/matrix-org/matrix-doc/pull/13	2015-03-19 14:21:08 +01:00
25_application_service_api.rst	big reshuffle:	2015-03-16 00:14:03 -04:00
30_server_server_api.rst	typo	2014-11-17 01:11:30 +00:00
31_event_signing.rst	big reshuffle:	2015-03-16 00:14:03 -04:00
42_push_overview.rst	lots of fixes based on kegan's review of https://github.com/matrix-org/matrix-doc/pull/13	2015-03-19 14:21:08 +01:00
43_push_cs_api.rst	Merge branch 'master' into ua925_reshuffle	2015-03-23 15:36:36 +00:00
44_push_push_gw_api.rst	lots of fixes based on kegan's review of https://github.com/matrix-org/matrix-doc/pull/13	2015-03-19 14:21:08 +01:00
45_typing_notifications.rst	big reshuffle:	2015-03-16 00:14:03 -04:00
50_appendices.rst	remove LI section entirely until we decide how best to discourage it, otherwise it looks like we're endorsing it	2015-02-19 20:23:11 +00:00