Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

This commit is contained in:
Taylor Otwell 2012-03-21 10:59:35 -05:00
parent ea8d80d67d 32e194ad21
commit 0893f3cca6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
laravel/database/query.php
View File

@ -182,7 +182,7 @@ public function join($table, $column1, $operator = null, $column2 = null, $type
* @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');
}

2
readme.md
View File

@ -41,7 +41,7 @@ ### Contributing to Laravel
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