diff options
author | Erik Johnston <erik@matrix.org> | 2019-12-11 17:01:41 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2019-12-11 17:01:41 +0000 |
commit | 6828b47c459ea15d2815fe880616aa260a546838 (patch) | |
tree | bdcc359e06bd7f7f977c976fe1d770bd708b0f55 /sytest-blacklist | |
parent | Newsfile (diff) | |
parent | Add `include_event_in_state` to _get_state_for_room (#6521) (diff) | |
download | synapse-6828b47c459ea15d2815fe880616aa260a546838.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/initial_sync_asnyc
Diffstat (limited to 'sytest-blacklist')
-rw-r--r-- | sytest-blacklist | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sytest-blacklist b/sytest-blacklist index 411cce0692..79b2d4402a 100644 --- a/sytest-blacklist +++ b/sytest-blacklist @@ -33,3 +33,6 @@ New federated private chats get full presence information (SYN-115) # Blacklisted due to https://github.com/matrix-org/matrix-doc/pull/2314 removing # this requirement from the spec Inbound federation of state requires event_id as a mandatory paramater + +# Blacklisted until https://github.com/matrix-org/synapse/pull/6486 lands +Can upload self-signing keys |