diff options
| author | Richard van der Hoff <richard@matrix.org> | 2019-01-09 16:52:08 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2019-01-09 16:52:08 +0000 |
| commit | 8d4b4e781f6d4502795cdeb2d588f685c718697f (patch) | |
| tree | 5ddd5f549be0a1916868078ba4c53fe2181a60fa | |
| parent | Merge branch 'master' into develop (diff) | |
| parent | fix docker build to install optional deps (diff) | |
| download | synapse-8d4b4e781f6d4502795cdeb2d588f685c718697f.tar.xz | |
Merge branch 'master' into develop
| -rw-r--r-- | docker/Dockerfile | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile |