From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Wed, 23 Nov 2016 00:19:44 +0000 (+0000)
Subject: Merge "Fix case of getMimeAnalyzer in MimeMagic class"
X-Git-Tag: 1.31.0-rc.0~4787
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/modifier.php?a=commitdiff_plain;h=4904b652ca4c5288d65d03f0c7ee080a95bbea68;hp=918f42ffc22fbde7437e6162d9d34ffd7bb6c60a;p=lhc%2Fweb%2Fwiklou.git

Merge "Fix case of getMimeAnalyzer in MimeMagic class"
---

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 32717f14f9..792b9bcc9f 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1586,7 +1586,7 @@ $wgEnableUserEmail = true;
 
 /**
  * Set to true to put the sending user's email in a Reply-To header
- * instead of From. ($wgEmergencyContact will be used as From.)
+ * instead of From. ($wgPasswordSender will be used as From.)
  *
  * Some mailers (eg SMTP) set the SMTP envelope sender to the From value,
  * which can cause problems with SPF validation and leak recipient addresses
diff --git a/package.json b/package.json
index 0e841f8eac..99e752cd6d 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
     "grunt-contrib-copy": "1.0.0",
     "grunt-contrib-watch": "1.0.0",
     "grunt-eslint": "19.0.0",
-    "grunt-jsonlint": "1.0.7",
+    "grunt-jsonlint": "1.1.0",
     "grunt-karma": "2.0.0",
     "grunt-stylelint": "0.6.0",
     "karma": "1.1.0",