From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Thu, 4 Jan 2018 21:56:45 +0000 (+0000)
Subject: Merge "Moved textbox1 building into TextConflictHelper on edit conflicts"
X-Git-Tag: 1.31.0-rc.0~996
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/%7B%7B%20url_for%28%27vote%27%2C%20idvote=vote.voteid%29%20%7D%7D?a=commitdiff_plain;h=d3d8c3fa855e6231e34772bfe6cd7284813ddc92;p=lhc%2Fweb%2Fwiklou.git

Merge "Moved textbox1 building into TextConflictHelper on edit conflicts"
---

d3d8c3fa855e6231e34772bfe6cd7284813ddc92