docs-matrix-spec/api/client-server
Mark Haines 3b390bff3c Merge branch 'master' into markjh/room_tags
Conflicts:
	api/client-server/v1/rooms.yaml
	specification/targets.yaml
2015-11-16 16:56:35 +00:00
..
v1 Merge branch 'master' into markjh/room_tags 2015-11-16 16:56:35 +00:00
v2_alpha Merge branch 'master' into markjh/room_tags 2015-11-16 16:56:35 +00:00
api-docs Shuffle around structure of matrix-doc and add a README. 2015-02-20 10:43:20 +00:00
api-docs-content Shuffle around structure of matrix-doc and add a README. 2015-02-20 10:43:20 +00:00
api-docs-directory Shuffle around structure of matrix-doc and add a README. 2015-02-20 10:43:20 +00:00
api-docs-events Shuffle around structure of matrix-doc and add a README. 2015-02-20 10:43:20 +00:00
api-docs-login Shuffle around structure of matrix-doc and add a README. 2015-02-20 10:43:20 +00:00
api-docs-presence Shuffle around structure of matrix-doc and add a README. 2015-02-20 10:43:20 +00:00
api-docs-profile Shuffle around structure of matrix-doc and add a README. 2015-02-20 10:43:20 +00:00
api-docs-registration Shuffle around structure of matrix-doc and add a README. 2015-02-20 10:43:20 +00:00
api-docs-rooms Test swagger commit 2015-02-20 14:29:51 +00:00