Merge branch 'master' into develop

cc0908cd · Taylor Otwell · 5fd1ea52 · 05cb1ea5 · cc0908cd · cc0908cd
Commit cc0908cd authored Jan 05, 2013 by Taylor Otwell
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

connection.php laravel/database/connection.php +1 -1

schema.php laravel/database/schema.php +1 -0

No files found.
--- a/laravel/database/connection.php
+++ b/laravel/database/connection.php
@@ -21,7 +21,7 @@ class Connection {
 	/**
 	 * The query grammar instance for the connection.
 	 *
-	 * @var Grammars\Grammar
+	 * @var Query\Grammars\Grammar
 	 */
 	protected $grammar;


--- a/laravel/database/schema.php
+++ b/laravel/database/schema.php
 <?php namespace Laravel\Database;

+use Closure;
 use Laravel\Fluent;
 use Laravel\Database as DB;