Andrew Morgan d670be7715 Merge commit 'b6c6fb795' into anoa/dinsic_release_1_21_x ...

* commit 'b6c6fb795':
  Allow guests to operate in encrypted rooms (#7314)

2020-10-16 17:20:55 +01:00

..

admin

Add an option to disable purge in delete room admin API (#7964)

2020-07-28 20:08:23 +01:00

client

Merge commit 'b6c6fb795' into anoa/dinsic_release_1_21_x

2020-10-16 17:20:55 +01:00

consent

Merge commit 'e8c36e527' into dinsic

2020-08-03 16:35:24 -07:00

key

Ensure that calls to json.dumps are compatible with the standard library json. (#7836)

2020-07-15 13:40:54 -04:00

media

Convert the remaining media repo code to async / await. (#7947)

2020-07-27 14:40:11 -04:00

oidc

Merge different Resource implementation classes (#7732)

2020-07-03 19:02:19 +01:00

saml2

Merge different Resource implementation classes (#7732)

2020-07-03 19:02:19 +01:00

__init__.py

Merge branch 'release-v1.13.0' of github.com:matrix-org/synapse into dinsic-release-v1.14.x

2020-06-10 16:58:10 +01:00

well_known.py

Dinsic Blacking with black==18.6b2

2020-02-11 16:18:29 +00:00