Merge "Fix comment handling on image upload or deletion"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 22 Oct 2018 15:08:42 +0000 (15:08 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 22 Oct 2018 15:08:42 +0000 (15:08 +0000)
1  2 
includes/filerepo/file/LocalFile.php

Simple merge