From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Thu, 14 Dec 2017 00:47:19 +0000 (+0000)
Subject: Merge "Track which namespaces edit conflicts are resolved in"
X-Git-Tag: 1.31.0-rc.0~1203
X-Git-Url: http://git.cyclocoop.org/%22.%24redirect_annul.%22?a=commitdiff_plain;h=7a16569a04d49d45d5f2dcaa903f0872e1357314;p=lhc%2Fweb%2Fwiklou.git

Merge "Track which namespaces edit conflicts are resolved in"
---

7a16569a04d49d45d5f2dcaa903f0872e1357314