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 2013-01-05 16:07:59 -06:00
parent 5fd1ea527f 05cb1ea5ad
commit cc0908cddc
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
laravel/database/connection.php
View File

@ -21,7 +21,7 @@ class Connection {
/** /**
* The query grammar instance for the connection. * The query grammar instance for the connection.
* *
* @var Grammars\Grammar * @var Query\Grammars\Grammar
*/ */
protected $grammar; protected $grammar;

1
laravel/database/schema.php
View File

@ -1,5 +1,6 @@
<?php namespace Laravel\Database; <?php namespace Laravel\Database;
use Closure;
use Laravel\Fluent; use Laravel\Fluent;
use Laravel\Database as DB; use Laravel\Database as DB;