diff options
author | Patrick Cloke <patrickc@matrix.org> | 2020-07-02 10:55:41 -0400 |
---|---|---|
committer | Patrick Cloke <patrickc@matrix.org> | 2020-07-02 10:55:41 -0400 |
commit | 4d978d7db4448e3cb526ee1087aeab578a31ac71 (patch) | |
tree | 872c47b3fb4843e720b4c785cbcb9e87a95779ae /synapse/app | |
parent | Hack to add push priority to push notifications (#7765) (diff) | |
parent | Merge tag 'v1.15.2' (diff) | |
download | synapse-4d978d7db4448e3cb526ee1087aeab578a31ac71.tar.xz |
Merge branch 'master' into develop
Diffstat (limited to 'synapse/app')
-rw-r--r-- | synapse/app/homeserver.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 299134d00f..09291d86ad 100644 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -56,6 +56,7 @@ from synapse.http.server import ( OptionsResource, RootOptionsRedirectResource, RootRedirect, + StaticResource, ) from synapse.http.site import SynapseSite from synapse.logging.context import LoggingContext @@ -228,7 +229,7 @@ class SynapseHomeServer(HomeServer): if name in ["static", "client"]: resources.update( { - STATIC_PREFIX: File( + STATIC_PREFIX: StaticResource( os.path.join(os.path.dirname(synapse.__file__), "static") ) } |