Merge "Fix return type of File::restore()"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 11 Jun 2019 14:20:09 +0000 (14:20 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 11 Jun 2019 14:20:09 +0000 (14:20 +0000)

Trivial merge