Merge branch 'master' into fsf-master
authorAndrew Engelbrecht <andrew@fsf.org>
Thu, 24 Jan 2019 18:58:54 +0000 (13:58 -0500)
committerAndrew Engelbrecht <andrew@fsf.org>
Thu, 24 Jan 2019 18:58:54 +0000 (13:58 -0500)
1  2 
image/discourse_test/Dockerfile
launcher

Simple merge
diff --cc launcher
Simple merge