Browse Source

Merge branch 'master' into develop

Taylor Otwell 12 years ago
parent
commit
0893f3cca6
2 changed files with 2 additions and 2 deletions
  1. 1 1
      laravel/database/query.php
  2. 1 1
      readme.md

+ 1 - 1
laravel/database/query.php

@@ -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');
 	}

+ 1 - 1
readme.md

@@ -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