Kegan Dougal 09ac367847 Merge branch 'master' into module-content-repo ... Conflicts: templating/matrix_templates/units.py		2015-10-02 10:46:46 +01:00
..
v1	Merge branch 'master' into module-content-repo	2015-10-02 10:46:46 +01:00
v2_alpha	Flesh out receipts module. Add receipts swagger	2015-10-01 15:41:54 +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