From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Fri, 26 Jan 2018 18:01:45 +0000 (+0000)
Subject: Merge "Revert and fix "Revert "EditPage: Show EditFilterMergedContent hook errors... 
X-Git-Tag: 1.31.0-rc.0~795
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dcompta/%7B%7B%20url_for%28%27user_edit%27%2C%20userid=session.user.id%29%20%7D%7D?a=commitdiff_plain;h=cc663e8f115f01fdb66968d2899120e9e6edad7a;p=lhc%2Fweb%2Fwiklou.git

Merge "Revert and fix "Revert "EditPage: Show EditFilterMergedContent hook errors in an errorbox"""
---

cc663e8f115f01fdb66968d2899120e9e6edad7a