Merge branch 'develop' into travis/login-terms

This commit is contained in:
Travis Ralston 2018-10-24 13:22:59 -06:00
commit 54def42c19
90 changed files with 2309 additions and 968 deletions

View file

@ -172,7 +172,10 @@ USER_FILTER_SCHEMA = {
# events a lot easier as we can then use a negative lookbehind
# assertion to split '\.' If we allowed \\ then it would
# incorrectly split '\\.' See synapse.events.utils.serialize_event
"pattern": "^((?!\\\).)*$"
#
# Note that because this is a regular expression, we have to escape
# each backslash in the pattern.
"pattern": r"^((?!\\\\).)*$"
}
}
},