Commit 32e194ad authored by Taylor Otwell's avatar Taylor Otwell

Merge branch 'master' of github.com:laravel/laravel

parents 599c69b4 7e7f70db
......@@ -182,7 +182,7 @@ class Query {
* @param string $column2
* @return Query
*/
public function left_join($table, $column1, $operator, $column2)
public function left_join($table, $column1, $operator = null, $column2 = null)
{
return $this->join($table, $column1, $operator, $column2, 'LEFT');
}
......
......@@ -41,7 +41,7 @@ Laravel is a clean and classy framework for PHP web development. Freeing you fro
Contributions are encouraged and welcome; however, please review the Developer Certificate of Origin in the "license.txt" file included in the repository. All commits must be signed off using the "-s" switch.
git commit -s -m "thie commit will be signed off automatically!"
git commit -s -m "this commit will be signed off automatically!"
### License
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment