diff options
author | Richard van der Hoff <richard@matrix.org> | 2018-10-24 11:23:49 +0100 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2018-10-24 11:23:49 +0100 |
commit | 3ad359e5becf7834fad3034a8d18f61206ede8f1 (patch) | |
tree | 741c28822a3b5e26d229be68bc06c95a25218748 /synapse/config | |
parent | Allow backslashes in event field filters (diff) | |
parent | Merge pull request #4082 from matrix-org/rav/fix_pep8 (diff) | |
download | synapse-3ad359e5becf7834fad3034a8d18f61206ede8f1.tar.xz |
Merge remote-tracking branch 'origin/develop' into rav/fix_event_filter_validation
Diffstat (limited to 'synapse/config')
-rw-r--r-- | synapse/config/repository.py | 2 |
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" |