summary refs log tree commit diff
path: root/synapse/rest/client/v2_alpha/capabilities.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-10-21 14:14:36 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2020-10-21 14:14:36 +0100
commite529fa7574e68ef97a1cd0bae493782fac2bf838 (patch)
treef094655476a9b2d89fb1316b40690c363208778f /synapse/rest/client/v2_alpha/capabilities.py
parentMerge commit '55bb5fda3' into anoa/dinsic_release_1_21_x (diff)
parentFix missing null character check on guest_access room state (diff)
downloadsynapse-e529fa7574e68ef97a1cd0bae493782fac2bf838.tar.xz
Merge commit '4325be1a5' into anoa/dinsic_release_1_21_x
* commit '4325be1a5':
  Fix missing null character check on guest_access room state
  Fixed a bug with reactivating users with the admin API (#8362)
  Admin API for reported events (#8217)
  Fix wording of deprecation notice in changelog
  Deprecation warning for synapse admin api being accessible under /_matrix
  Create function to check for long names in devices (#8364)
  Add a comment re #1691
  Fix a bad merge from release-v1.20.0. (#8354)
  Admin API for querying rooms where a user is a member (#8306)
  Catch-up after Federation Outage (bonus): Catch-up on Synapse Startup (#8322)
  Simplify super() calls to Python 3 syntax. (#8344)
  Allow appservice users to /login (#8320)
  Update test logging to be able to accept braces (#8335)
  Move lint dependencies to extras_require (#8330)
Diffstat (limited to 'synapse/rest/client/v2_alpha/capabilities.py')
-rw-r--r--synapse/rest/client/v2_alpha/capabilities.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/client/v2_alpha/capabilities.py b/synapse/rest/client/v2_alpha/capabilities.py

index fe9d019c44..76879ac559 100644 --- a/synapse/rest/client/v2_alpha/capabilities.py +++ b/synapse/rest/client/v2_alpha/capabilities.py
@@ -32,7 +32,7 @@ class CapabilitiesRestServlet(RestServlet): Args: hs (synapse.server.HomeServer): server """ - super(CapabilitiesRestServlet, self).__init__() + super().__init__() self.hs = hs self.config = hs.config self.auth = hs.get_auth()