summary refs log tree commit diff
path: root/synapse/util/stringutils.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-07-10 18:04:03 +0100
committerRichard van der Hoff <richard@matrix.org>2018-07-10 18:04:03 +0100
commitf04e35c17001171df58ace4fed63772d8101d7fc (patch)
tree11424fdd20122c014262283d4401c84ffbcd9978 /synapse/util/stringutils.py
parentMerge branch 'develop' of git+ssh://github.com/matrix-org/synapse into matrix... (diff)
parents/becuase/because/g (diff)
downloadsynapse-f04e35c17001171df58ace4fed63772d8101d7fc.tar.xz
Merge branch 'develop' into matrix-org-hotfixes
Diffstat (limited to 'synapse/util/stringutils.py')
-rw-r--r--synapse/util/stringutils.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/util/stringutils.py b/synapse/util/stringutils.py

index b98b9dc6e4..43d9db67ec 100644 --- a/synapse/util/stringutils.py +++ b/synapse/util/stringutils.py
@@ -15,6 +15,7 @@ import random import string + from six.moves import range _string_with_symbols = (