summary refs log tree commit diff
path: root/changelog.d
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2021-04-06 13:28:54 +0100
committerErik Johnston <erik@matrix.org>2021-04-06 13:29:29 +0100
commit5688a74cf3042c0064e3600cb03f6edaa7f7c838 (patch)
treeb7dd5c333d6b6c45aa27fb79d5f67e51f3b86941 /changelog.d
parentAdd type hints to the federation handler and server. (#9743) (diff)
parent 1.31.0 (diff)
downloadsynapse-5688a74cf3042c0064e3600cb03f6edaa7f7c838.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'changelog.d')
-rw-r--r--changelog.d/9720.misc1
-rw-r--r--changelog.d/9734.misc1
2 files changed, 0 insertions, 2 deletions
diff --git a/changelog.d/9720.misc b/changelog.d/9720.misc
deleted file mode 100644
index 9dd0bc9cff..0000000000
--- a/changelog.d/9720.misc
+++ /dev/null
@@ -1 +0,0 @@
-Revert using `dmypy run` in lint script.
diff --git a/changelog.d/9734.misc b/changelog.d/9734.misc
deleted file mode 100644
index 20ed9a06a9..0000000000
--- a/changelog.d/9734.misc
+++ /dev/null
@@ -1 +0,0 @@
-Pin flake8-bugbear's version.
\ No newline at end of file