mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-18 12:23:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into neilalexander/stateresv2

Browse source
This commit is contained in:
Neil Alexander 2020-02-20 13:54:56 +00:00
parent f198084271 0352f250b8
commit 9d639f5eec
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docker/Dockerfile
View file

@ -1,8 +1,4 @@
<<<<<<< HEAD
FROM docker.io/golang:1.13.7-alpine3.11 FROM docker.io/golang:1.13.7-alpine3.11
=======
FROM docker.io/golang:1.13.6-alpine
>>>>>>> master
RUN mkdir /build RUN mkdir /build