From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Sun, 13 Jan 2019 01:48:47 +0000 (+0000)
Subject: Merge "Clarify warnings about missing software diff3 and git."
X-Git-Tag: 1.34.0-rc.0~3087
X-Git-Url: http://git.cyclocoop.org/%7B%7B%20url_for%28%27admin_vote_del%27%2C%20idvote=vote.voteid%29%20%7D%7D?a=commitdiff_plain;h=ed1adb77fa5504a4d1b41a8881926c57386ddd8e;p=lhc%2Fweb%2Fwiklou.git

Merge "Clarify warnings about missing software diff3 and git."
---

ed1adb77fa5504a4d1b41a8881926c57386ddd8e