diff options
author | Patrick Cloke <clokep@users.noreply.github.com> | 2020-09-18 12:54:04 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-09-18 12:54:04 -0400 |
commit | babc0275431c68e64050db11959d74a636afbd3e (patch) | |
tree | 1294ba77a0a06e4a5bbf24fbc2a4b28c77fc0343 | |
parent | Merge tag 'v1.20.0rc5' into develop (diff) | |
download | synapse-babc0275431c68e64050db11959d74a636afbd3e.tar.xz |
Fix a bad merge from release-v1.20.0. (#8354)
-rw-r--r-- | changelog.d/8354.misc | 1 | ||||
-rw-r--r-- | synapse/handlers/pagination.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/8354.misc b/changelog.d/8354.misc new file mode 100644 |