diff options
author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-11-01 17:34:56 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-01 17:34:56 +0000 |
commit | 3149d55b7d2103953eca83595d135f979f710b86 (patch) | |
tree | cb1541aa4c8d68900e855766d26c6c498512d072 | |
parent | Merge pull request #4004 from matrix-org/travis/login-terms (diff) | |
parent | changelog.d entry somehow got lost (diff) | |
download | synapse-3149d55b7d2103953eca83595d135f979f710b86.tar.xz |
Merge pull request #3778 from z3ntu/patch-1
Fix build of Docker image with docker-compose
-rw-r--r-- | changelog.d/3778.misc | 1 | ||||
-rw-r--r-- | contrib/docker/docker-compose.yml | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/changelog.d/3778.misc b/changelog.d/3778.misc new file mode 100644 |