summary refs log tree commit diff
path: root/synapse/storage/databases/main/search.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2021-04-19 14:32:50 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2021-04-19 14:32:50 +0100
commitbf4ad8070e235d687472b1952c0b9d18db693341 (patch)
treec83dc75dc7d9b677b292f515a4d8133184b27944 /synapse/storage/databases/main/search.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff)
parentDon't send normal presence updates over federation replication stream (#9828) (diff)
downloadsynapse-bf4ad8070e235d687472b1952c0b9d18db693341.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/storage/databases/main/search.py')
-rw-r--r--synapse/storage/databases/main/search.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/synapse/storage/databases/main/search.py b/synapse/storage/databases/main/search.py

index cea5829cf6..f47e4ed0bc 100644 --- a/synapse/storage/databases/main/search.py +++ b/synapse/storage/databases/main/search.py
@@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2015, 2016 OpenMarket Ltd # # Licensed under the Apache License, Version 2.0 (the "License");