Merge branch 'develop' into dmr/pyproject-poetry

Signed-off-by: Dan Callahan <[email protected]>

Author: callahad

.github/workflows/docs.yaml

@@ -22,7 +22,7 @@ jobs:
       - name: Setup mdbook
         uses: peaceiris/actions-mdbook@4b5ef36b314c2599664ca107bb8c02412548d79d # v1.1.14
         with:
-          mdbook-version: '0.4.9'
+          mdbook-version: '0.4.17'
 
       - name: Build the documentation
         # mdbook will only create an index.html if we're including docs/README.md in SUMMARY.md.

.gitignore

@@ -15,7 +15,8 @@ _trial_temp*/
 .DS_Store
 __pycache__/
 
-# We do want the poetry lockfile. Ignoring '*.lock' above seems to ignore tox and trial lock files.
+# We do want the poetry lockfile.
+# TODO: is there a good reason for ignoring '*.lock' above? If not, nuke it.
 !poetry.lock
 
 # stuff that is likely to exist when you run a server locally

CHANGES-pre-1.0.md

@@ -0,0 +1 @@
+Optimise fetching large quantities of missing room state over federation.