From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Sat, 8 Apr 2017 09:33:14 +0000 (+0000)
Subject: Merge "Add .rej files to .gitignore"
X-Git-Tag: 1.31.0-rc.0~3560
X-Git-Url: http://git.heureux-cyclage.org/?a=commitdiff_plain;h=730d7f603785d836371ab36734ce560b0872f914;p=lhc%2Fweb%2Fwiklou.git

Merge "Add .rej files to .gitignore"
---

730d7f603785d836371ab36734ce560b0872f914