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

@ -122,7 +122,7 @@ class AuthRestServlet(RestServlet):
cannot be handled in the normal flow (with requests to the same endpoint).
Current use is for web fallback auth.
"""
PATTERNS = client_v2_patterns("/auth/(?P<stagetype>[\w\.]*)/fallback/web")
PATTERNS = client_v2_patterns(r"/auth/(?P<stagetype>[\w\.]*)/fallback/web")
def __init__(self, hs):
super(AuthRestServlet, self).__init__()