Daniel Wagner-Hall 2502ca7ac6 Merge branch 'master' into daniel/threepidinvites-2 ... Conflicts: specification/targets.yaml		2015-10-12 18:11:01 +01:00
..
v1	Merge branch 'master' into daniel/threepidinvites-2	2015-10-12 18:11:01 +01:00
v2_alpha	Missing symlink for the v2 swagger APIs	2015-10-06 17:43:04 +01: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