summary refs log tree commit diff
path: root/synapse/config/api.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-07-10 18:04:03 +0100
committerRichard van der Hoff <richard@matrix.org>2018-07-10 18:04:03 +0100
commitf04e35c17001171df58ace4fed63772d8101d7fc (patch)
tree11424fdd20122c014262283d4401c84ffbcd9978 /synapse/config/api.py
parentMerge branch 'develop' of git+ssh://github.com/matrix-org/synapse into matrix... (diff)
parents/becuase/because/g (diff)
downloadsynapse-f04e35c17001171df58ace4fed63772d8101d7fc.tar.xz
Merge branch 'develop' into matrix-org-hotfixes
Diffstat (limited to 'synapse/config/api.py')
-rw-r--r--synapse/config/api.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/config/api.py b/synapse/config/api.py

index 20ba33226a..403d96ba76 100644 --- a/synapse/config/api.py +++ b/synapse/config/api.py
@@ -12,10 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -from ._base import Config - from synapse.api.constants import EventTypes +from ._base import Config + class ApiConfig(Config):