diff options
| author | Neil Johnson <neil@fragile.org.uk> | 2018-03-26 11:29:10 +0100 |
|---|---|---|
| committer | Neil Johnson <neil@fragile.org.uk> | 2018-03-26 11:29:10 +0100 |
| commit | 36c43eef17173439cd8f6773e4994bc4d5086d3d (patch) | |
| tree | 1fd10b3477d49b248cf0d8f86f5a6ad44dc8b149 /synapse/storage/search.py | |
| parent | more simplejson (diff) | |
| parent | fix typo (diff) | |
| download | synapse-36c43eef17173439cd8f6773e4994bc4d5086d3d.tar.xz | |
Merge branch 'develop' of https://github.com/matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/storage/search.py')
| -rw-r--r-- | synapse/storage/search.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/search.py b/synapse/storage/search.py |