projects / discourse_docker.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5fe0a01 d5c4bf2)
Merge branch 'master' into fsf-master
authorAndrew Engelbrecht <andrew@fsf.org>
Fri, 1 Feb 2019 15:35:27 +0000 (10:35 -0500)
committerAndrew Engelbrecht <andrew@fsf.org>
Fri, 1 Feb 2019 15:35:27 +0000 (10:35 -0500)
1  2 
image/base/Dockerfile patch | diff1 | diff2 | blob | history
image/discourse_test/Dockerfile patch | diff1 | diff2 | blob | history

diff --cc image/base/Dockerfile
Simple merge
diff --cc image/discourse_test/Dockerfile
Simple merge