summary refs log tree commit diff
path: root/synapse/config/repository.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-10-24 11:23:49 +0100
committerRichard van der Hoff <richard@matrix.org>2018-10-24 11:23:49 +0100
commit3ad359e5becf7834fad3034a8d18f61206ede8f1 (patch)
tree741c28822a3b5e26d229be68bc06c95a25218748 /synapse/config/repository.py
parentAllow backslashes in event field filters (diff)
parentMerge pull request #4082 from matrix-org/rav/fix_pep8 (diff)
downloadsynapse-3ad359e5becf7834fad3034a8d18f61206ede8f1.tar.xz
Merge remote-tracking branch 'origin/develop' into rav/fix_event_filter_validation
Diffstat (limited to 'synapse/config/repository.py')
-rw-r--r--synapse/config/repository.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/config/repository.py b/synapse/config/repository.py

index fc909c1fac..06c62ab62c 100644 --- a/synapse/config/repository.py +++ b/synapse/config/repository.py
@@ -178,7 +178,7 @@ class ContentRepositoryConfig(Config): def default_config(self, **kwargs): media_store = self.default_path("media_store") uploads_path = self.default_path("uploads") - return """ + return r""" # Directory where uploaded images and attachments are stored. media_store_path: "%(media_store)s"