Merge branch '5.6' of github.com:laravel/framework into 5.6

laravel · Feb 7, 2018 · 427effa · 427effa
2 parents 9290529 + 71451ee
commit 427effa
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/Illuminate/Routing/ResponseFactory.php b/src/Illuminate/Routing/ResponseFactory.php
@@ -156,7 +156,7 @@ public function download($file, $name = null, array $headers = [], $disposition
     }
 
     /**
-     * Conver the string to ASCII characters that are equivalent to the given name.
+     * Convert the string to ASCII characters that are equivalent to the given name.
      *
      * @param  string  $name
      * @return string