From 75e3e28a54bdd62a63af11f28e3703326ea5f16c Mon Sep 17 00:00:00 2001
From: Travis Ralston <travisr@matrix.org>
Date: Tue, 4 Jan 2022 16:38:01 -0700
Subject: [PATCH 1/2] Documentation for extensible events labs flag

---
 docs/labs.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/docs/labs.md b/docs/labs.md
index 9a61bea742d..779c8246048 100644
--- a/docs/labs.md
+++ b/docs/labs.md
@@ -172,3 +172,19 @@ triggered by the button to the right of the filter field.
 ## Spotlight search (`feature_spotlight`) [In Development]
 
 Switches to a new room search experience.
+
+## Extensible events rendering (`feature_extensible_events`) [In Development]
+
+*Intended for developer use only at the moment.*
+
+Extensible Events are a [new event format](https://github.com/matrix-org/matrix-doc/pull/1767) which
+supports graceful fallback in unknown event types. Instead of rendering nothing or a blank space, events
+can define a series of other events which represent the event's information but in different ways. The
+base of these fallbacks being text.
+
+Turning this flag on indicates that, when possible, the extensible events structure should be parsed on
+supported event types. This should lead to zero perceptual change in the timeline except in cases where
+the sender is using unknown/unrecognised event types.
+
+Sending events with extensible events structure is always enabled - this should not affect any downstream
+client.

From 175fa9d15fb328e5b4f9d506fdc103f14c9c391f Mon Sep 17 00:00:00 2001
From: Travis Ralston <travisr@matrix.org>
Date: Mon, 10 Jan 2022 22:28:30 -0700
Subject: [PATCH 2/2] Fix git protocol usage

Prevents this:
```
+ git clone git://github.com/matrix-org/matrix-js-sdk.git matrix-js-sdk --branch develop --depth 1
Cloning into 'matrix-js-sdk'...
fatal: remote error:
  The unauthenticated git protocol on port 9418 is no longer supported.
Please see https://github.blog/2021-09-01-improving-git-protocol-security-github/ for more information.
```
---
 scripts/fetch-develop.deps.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/fetch-develop.deps.sh b/scripts/fetch-develop.deps.sh
index 421656ed940..0d999048dd7 100755
--- a/scripts/fetch-develop.deps.sh
+++ b/scripts/fetch-develop.deps.sh
@@ -25,7 +25,7 @@ function clone() {
     if [ -n "$branch" ]
     then
         echo "Trying to use $org/$repo#$branch"
-        git clone git://github.com/$org/$repo.git $repo --branch $branch \
+        git clone https://github.com/$org/$repo.git $repo --branch $branch \
             "${GIT_CLONE_ARGS[@]}"
         return $?
     fi