Merge "Track which namespaces edit conflicts are resolved in"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 14 Dec 2017 00:47:19 +0000 (00:47 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 14 Dec 2017 00:47:19 +0000 (00:47 +0000)

Trivial merge