diff options
author | Brendan Abolivier <babolivier@matrix.org> | 2020-07-30 19:00:29 +0100 |
---|---|---|
committer | Brendan Abolivier <babolivier@matrix.org> | 2020-07-30 19:00:29 +0100 |
commit | 69158e554f30ac8b6b646a62fa496a2c0005dea6 (patch) | |
tree | 42fdb177abede9c0128906d4e6661cde0ee9cd6c /changelog.d/7802.misc | |
parent | Changelog (diff) | |
parent | Update workers docs (#7990) (diff) | |
download | synapse-69158e554f30ac8b6b646a62fa496a2c0005dea6.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into babolivier/new_push_rules
Diffstat (limited to 'changelog.d/7802.misc')
-rw-r--r-- | changelog.d/7802.misc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/changelog.d/7802.misc b/changelog.d/7802.misc deleted file mode 100644 index d81f8875c5..0000000000 --- a/changelog.d/7802.misc +++ /dev/null @@ -1 +0,0 @@ - Switch from simplejson to the standard library json. |