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)
commit7b3db15202d564c269576d28f7887c6c58a22954
tree5439070f853e472b1ca483729fbda0d9704bbc61
parent265f9cc77f2fffb12826f81c01bd5fb139cf2e96
parentf73c2d031596e710d4ab5474e89cc4e22bc4efaa
Merge branch 'master' into fsf-master

We don't need our patch to remove "restricted" from the Ubuntu repo
list, because Discourse is now using Debian main.
image/discourse_test/Dockerfile
launcher