Merge c94b54dab1 into 4ed55a60ec

Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>

changelogs/application_service/newsfragments/2130.feature

@@ -0,0 +1 @@
+Correct null value handling for the AS Registration's `url` property.

changelogs/internal/newsfragments/2079.new

@@ -0,0 +1 @@
+Make disclosure of conflicts of interest mandatory for spec change proposals.

content/proposals.md

@@ -79,6 +79,19 @@ Please [see
 MSC1779](https://github.com/matrix-org/matrix-spec-proposals/blob/main/proposals/1779-open-governance.md)
 for full details of the project's Guiding Principles.
 
+For the purposes of transparency and to underpin the "greater benefit"
+principle, proposals MUST disclose possible conflicts of interest where
+they might reasonably exist. Authors MAY do this by filling out the
+following checklist and publishing it together with their proposal.
+
+```
+- [ ] I am being paid for working on this proposal by <ORGANIZATION>
+- [ ] I am an employee or member of <ORGANIZATION> which is involved in the Matrix ecosystem
+- [ ] I have another relationship that might appear to be a conflict of interest: <DETAILS>
+- [ ] I have some other type of financial interest in Matrix or this proposal: <DETAILS>
+- [ ] None of the above
+```
+
 ## Technical notes
 
 Proposals **must** develop Matrix as a layered protocol: with new
@@ -193,7 +206,8 @@ is as follows:
         filename that follows the format `1234-my-new-proposal.md` where
         `1234` is the MSC ID.
     -   Your PR description must include a link to the rendered Markdown
-        document and a summary of the proposal.
+        document and a disclosure of potential conflicts of interest where
+        they might reasonably apply.
     -   It is often very helpful to link any related MSCs or [matrix-spec
         issues](https://github.com/matrix-org/matrix-spec/issues) to give
         context for the proposal.

data/api/application-service/definitions/registration.yaml

@@ -19,7 +19,7 @@ properties:
     type: string
     description: A unique, user-defined ID of the application service which will never change.
   url:
-    type: string
+    type: ["null", "string"]
     description: The URL for the application service. May include a path after the domain name. Optionally set to null if no traffic is required.
   as_token:
     type: string