From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Sun, 9 Dec 2018 23:47:25 +0000 (+0000)
Subject: Merge "Allow users to block the user that blocked them."
X-Git-Tag: 1.34.0-rc.0~3300
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/pie.php?a=commitdiff_plain;h=86bf710e44a3174b4a93e57dc4107b936d24626b;p=lhc%2Fweb%2Fwiklou.git

Merge "Allow users to block the user that blocked them."
---

86bf710e44a3174b4a93e57dc4107b936d24626b