Merge pull request #1879 from matrix-org/travis/fix-capabilities

Correctly nest the capabilities response object

api/client-server/capabilities.yaml

@@ -62,11 +62,15 @@ paths:
           schema:
             type: object
             required: ["capabilities"]
-            additionalProperties:
+            properties:
+              capabilities:
                 type: object
+                title: Capabilities
                 description: |-
                     The custom capabilities the server supports, using the
                     Java package naming convention.
+                additionalProperties:
+                  type: object
                 properties:
                   "m.change_password":
                     type: object

changelogs/client_server/newsfragments/1879.feature

@@ -0,0 +1 @@
+Support optional features by having clients query for capabilities.