diff options
| author | David Baker <dave@matrix.org> | 2018-11-09 18:35:02 +0000 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2018-11-09 18:35:02 +0000 |
| commit | bca3b91c2dfeb63b43c3bfbb6700a38d4903f1eb (patch) | |
| tree | ec18566349f9e3cae83699cffd2a714ae9dce932 /synapse/api/urls.py | |
| parent | pep8 (diff) | |
| parent | Merge pull request #4168 from matrix-org/babolivier/federation-client-content... (diff) | |
| download | synapse-bca3b91c2dfeb63b43c3bfbb6700a38d4903f1eb.tar.xz | |
Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backup_versions_are_numbers
Diffstat (limited to 'synapse/api/urls.py')
| -rw-r--r-- | synapse/api/urls.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/synapse/api/urls.py b/synapse/api/urls.py |