Mark Haines c539b208f9 Merge branch 'markjh/room_tags' into markjh/client_config ... Conflicts: api/client-server/v2_alpha/sync.yaml		2015-11-26 16:56:39 +00:00
..
v1	Merge branch 'markjh/room_tags' into markjh/client_config	2015-11-20 18:40:56 +00:00
v2_alpha	Merge branch 'markjh/room_tags' into markjh/client_config	2015-11-26 16:56:39 +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