Merge remote-tracking branch 'upstream/master'

This commit is contained in:
bergware
2018-06-05 08:33:52 +02:00
3 changed files with 5 additions and 5 deletions
@@ -532,7 +532,7 @@ class DockerClient {
'304' => 'Container already started',
'400' => 'Bad parameter',
'404' => 'No such container',
'409' => 'Image can not be deleted<br><i>In use by other container(s)</i>',
'409' => 'Image can not be deleted, in use by other container(s)',
'500' => 'Server error'
];