diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2018-10-04 22:41:52 +1000 |
|---|---|---|
| committer | Amber Brown <hawkowl@atleastfornow.net> | 2018-10-04 22:41:52 +1000 |
| commit | d86794325f770f4d4e9a13a993809a53b58d9122 (patch) | |
| tree | 42b83cb83e654a1bb89d5da4a2c69ac843ed2ee9 /changelog.d/3948.misc | |
| parent | Merge pull request #3999 from matrix-org/erikj/fix_3pid_invite_rejetion (diff) | |
| parent | changelog (diff) | |
| download | synapse-d86794325f770f4d4e9a13a993809a53b58d9122.tar.xz | |
Merge branch 'master' into develop
Diffstat (limited to 'changelog.d/3948.misc')
| -rw-r--r-- | changelog.d/3948.misc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/changelog.d/3948.misc b/changelog.d/3948.misc deleted file mode 100644 index a93edbd1c3..0000000000 --- a/changelog.d/3948.misc +++ /dev/null @@ -1 +0,0 @@ -Fix incompatibility with python3 on alpine \ No newline at end of file |