From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Tue, 31 Oct 2017 20:09:30 +0000 (+0000)
Subject: Merge "EditPage: Extract some edit conflict code into EditConflictHelper"
X-Git-Tag: 1.31.0-rc.0~1642
X-Git-Url: https://git.cyclocoop.org/admin/%7B%24admin_url%7Dmembres/%7B%7B%20url_for%28%27new_vote%27%29%20%7D%7D?a=commitdiff_plain;h=f8b3f04ae6d78a13b5793a0c4e3bc7080b2c72af;p=lhc%2Fweb%2Fwiklou.git

Merge "EditPage: Extract some edit conflict code into EditConflictHelper"
---

f8b3f04ae6d78a13b5793a0c4e3bc7080b2c72af