diff options
author | Neil Johnson <neil@matrix.org> | 2018-10-24 16:25:39 +0100 |
---|---|---|
committer | Neil Johnson <neil@matrix.org> | 2018-10-24 16:25:39 +0100 |
commit | 07126e43a4db2d898e015186902031c8311093cb (patch) | |
tree | 56c45f6cafd6ceaae2341b07de65c294327cd365 /synapse/config | |
parent | remove white space (diff) | |
parent | fix branch regexp (diff) | |
download | synapse-07126e43a4db2d898e015186902031c8311093cb.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/fix_mau_init
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" |