Merge "resourceloader: Use AND instead of OR for upsert conds in saveFileDependencies()"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 24 May 2019 13:37:43 +0000 (13:37 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 24 May 2019 13:37:43 +0000 (13:37 +0000)

Trivial merge