diff options
author | Neil Johnson <neil@matrix.org> | 2019-04-01 14:08:53 +0100 |
---|---|---|
committer | Neil Johnson <neil@matrix.org> | 2019-04-01 14:08:53 +0100 |
commit | 62988f73fd6f005835996f2c2134b8c09a515575 (patch) | |
tree | c5d5310246c9f97e97dbffcd59482159a7ab7a81 /changelog.d/4843.misc | |
parent | Collect room-version variations into one place (#4969) (diff) | |
parent | 0.99.3 (diff) | |
download | synapse-62988f73fd6f005835996f2c2134b8c09a515575.tar.xz |
Merge branch 'master' into develop
Diffstat (limited to 'changelog.d/4843.misc')
-rw-r--r-- | changelog.d/4843.misc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/changelog.d/4843.misc b/changelog.d/4843.misc deleted file mode 100644 index 03d0a3e2e7..0000000000 --- a/changelog.d/4843.misc +++ /dev/null @@ -1 +0,0 @@ -Add stuff back to the .gitignore. |