Merge branch 'master' into fsf-master
authorAndrew Engelbrecht <andrew@fsf.org>
Mon, 8 Apr 2019 14:47:15 +0000 (10:47 -0400)
committerAndrew Engelbrecht <andrew@fsf.org>
Mon, 8 Apr 2019 14:47:15 +0000 (10:47 -0400)
commit6717382dbf4bbd882a7f5ac2a02111f748c50882
tree6b573c703a98f909a755ce06c6585f27b466df78
parentb9f04fc174d9bb2b0da21dd1a8f46b3985cda99e
parentf727e7c8f4a121b8045f7ac8d92be6fb272c2dfc
Merge branch 'master' into fsf-master

new docker image, according the launcher merge conflict
launcher