diff options
author | Erik Johnston <erik@matrix.org> | 2018-07-24 15:49:38 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2018-07-24 15:49:38 +0100 |
commit | aa1bf10b9106f9894494456ae02b4e2a87f2eebb (patch) | |
tree | a364b128db1c356964bec20f90768d3422e642f8 /synapse/rest/client/v1/admin.py | |
parent | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff) | |
parent | Merge pull request #3595 from matrix-org/erikj/use_deltas (diff) | |
download | synapse-aa1bf10b9106f9894494456ae02b4e2a87f2eebb.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/rest/client/v1/admin.py')
-rw-r--r-- | synapse/rest/client/v1/admin.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/synapse/rest/client/v1/admin.py b/synapse/rest/client/v1/admin.py |