diff options
author | Will Hunt <will@half-shot.uk> | 2018-08-16 01:13:05 +0100 |
---|---|---|
committer | Will Hunt <will@half-shot.uk> | 2018-08-16 01:13:05 +0100 |
commit | b3e005de18d8cc0d871f3f4f4bbfee4d2eca9c24 (patch) | |
tree | f2e43f102010ea827fd94e54c79f3036b53f9539 /changelog.d/3662.feature | |
parent | isorted this mess (diff) | |
parent | Merge pull request #3686 from matrix-org/rav/changelog_links_to_prs (diff) | |
download | synapse-b3e005de18d8cc0d871f3f4f4bbfee4d2eca9c24.tar.xz |
Merge remote-tracking branch 'upstream/develop' into hs/upload-limits
Diffstat (limited to 'changelog.d/3662.feature')
-rw-r--r-- | changelog.d/3662.feature | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/changelog.d/3662.feature b/changelog.d/3662.feature new file mode 100644 |