summary refs log tree commit diff
path: root/docker
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-06-17 14:10:28 +0100
committerErik Johnston <erik@matrix.org>2019-06-17 14:10:28 +0100
commitc08e4dbadc36d5547d4ff14ec4d985823666fb80 (patch)
tree3a79f31f2785db645e5f28088c63e8e06c01c0ca /docker
parentMerge branch 'master' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff)
parentMerge pull request #5385 from matrix-org/erikj/reduce_http_exceptions (diff)
downloadsynapse-c08e4dbadc36d5547d4ff14ec4d985823666fb80.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'docker')
-rw-r--r--docker/README.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/README.md b/docker/README.md

index df5d0151e2..5a596eecb9 100644 --- a/docker/README.md +++ b/docker/README.md
@@ -14,7 +14,7 @@ This image is designed to run either with an automatically generated configuration file or with a custom configuration that requires manual editing. An easy way to make use of this image is via docker-compose. See the -[contrib/docker](../contrib/docker) section of the synapse project for +[contrib/docker](https://github.com/matrix-org/synapse/tree/master/contrib/docker) section of the synapse project for examples. ### Without Compose (harder)