From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Fri, 24 May 2019 13:37:43 +0000 (+0000)
Subject: Merge "resourceloader: Use AND instead of OR for upsert conds in saveFileDependencies()"
X-Git-Tag: 1.34.0-rc.0~1601
X-Git-Url: http://git.heureux-cyclage.org/?a=commitdiff_plain;h=5379511a9210bf2cce5af6b2b7b6e7ed6df3f0ee;p=lhc%2Fweb%2Fwiklou.git

Merge "resourceloader: Use AND instead of OR for upsert conds in saveFileDependencies()"
---

5379511a9210bf2cce5af6b2b7b6e7ed6df3f0ee