Merge branch '5.1' into 5.2

# Conflicts: # .gitattributes
laravel · Apr 20, 2016 · 934c915 · 934c915
2 parents cba62a9 + b9aef4f
commit 934c915
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/.gitattributes b/.gitattributes
@@ -10,3 +10,4 @@
 .travis.yml export-ignore
 phpunit.xml export-ignore
 CHANGELOG.md export-ignore
+CONTRIBUTING.md export-ignore
diff --git a/src/Illuminate/Mail/composer.json b/src/Illuminate/Mail/composer.json
@@ -33,7 +33,8 @@
     },
     "suggest": {
         "aws/aws-sdk-php": "Required to use the SES mail driver (~3.0).",
-        "guzzlehttp/guzzle": "Required to use the Mailgun and Mandrill mail drivers (~5.3|~6.0)."
+        "guzzlehttp/guzzle": "Required to use the Mailgun and Mandrill mail drivers (~5.3|~6.0).",
+        "jeremeamia/superclosure": "Required to be able to serialize closures (~2.0)."
     },
     "minimum-stability": "dev"
 }