diff options
| author | Travis Ralston <travpc@gmail.com> | 2018-10-24 13:22:59 -0600 |
|---|---|---|
| committer | Travis Ralston <travpc@gmail.com> | 2018-10-24 13:22:59 -0600 |
| commit | 54def42c19c51b102dbd9a77dfd2430944a94d79 (patch) | |
| tree | da30431884421f42ab95e103bf66c7343d4cc4c4 /synapse/storage/pusher.py | |
| parent | Fix terms UI auth test (diff) | |
| parent | fix branch regexp (diff) | |
| download | synapse-54def42c19c51b102dbd9a77dfd2430944a94d79.tar.xz | |
Merge branch 'develop' into travis/login-terms
Diffstat (limited to 'synapse/storage/pusher.py')
| -rw-r--r-- | synapse/storage/pusher.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/pusher.py b/synapse/storage/pusher.py index c7987bfcdd..2743b52bad 100644 --- a/synapse/storage/pusher.py +++ b/synapse/storage/pusher.py @@ -29,7 +29,7 @@ from ._base import SQLBaseStore logger = logging.getLogger(__name__) if six.PY2: - db_binary_type = buffer + db_binary_type = six.moves.builtins.buffer else: db_binary_type = memoryview |