summary refs log tree commit diff
path: root/synapse/storage/databases/main/ui_auth.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-10-20 19:28:12 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2020-10-20 19:28:12 +0100
commite13218756c10b95cd018accd4433d0b9b99534d8 (patch)
treef4c5d4338d0db630afde9a55b24a80311c22d309 /synapse/storage/databases/main/ui_auth.py
parentMerge commit 'a3a90ee03' into anoa/dinsic_release_1_21_x (diff)
parent1.20.0rc3 (diff)
downloadsynapse-e13218756c10b95cd018accd4433d0b9b99534d8.tar.xz
Merge commit '2832ef5bb' into anoa/dinsic_release_1_21_x
* commit '2832ef5bb':
  1.20.0rc3
  Fix the exception that is raised when invalid JSON is encountered. (#8291)
  Remove shared rooms info from upgrade/workers doc as it's still experimental (#8290)
Diffstat (limited to 'synapse/storage/databases/main/ui_auth.py')
0 files changed, 0 insertions, 0 deletions