projects / discourse_docker.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 265f9cc f73c2d0)
Merge branch 'master' into fsf-master
authorAndrew Engelbrecht <andrew@fsf.org>
Fri, 23 Aug 2019 15:47:02 +0000 (11:47 -0400)
committerAndrew Engelbrecht <andrew@fsf.org>
Fri, 23 Aug 2019 15:47:02 +0000 (11:47 -0400)
We don't need our patch to remove "restricted" from the Ubuntu repo
list, because Discourse is now using Debian main.

1  2 
image/discourse_test/Dockerfile patch | diff1 | diff2 | blob | history
launcher patch | diff1 | diff2 | blob | history

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