phuongtc/minicrm
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix conflicts.

Browse Source
This commit is contained in:
Taylor Otwell
2015-03-13 22:04:40 -05:00
parent ce5bcb2f8f c822db1f5b
commit 5644e8e320
2 changed files with 2804 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bootstrap/autoload.php
+1 -1
View File
@@ -27,7 +27,7 @@ require __DIR__.'/../vendor/autoload.php';
| |
*/ */
$compiledPath = __DIR__.'/../storage/framework/compiled.php'; $compiledPath = __DIR__.'/../vendor/compiled.php';
if (file_exists($compiledPath)) { if (file_exists($compiledPath)) {
require $compiledPath; require $compiledPath;
composer.lock
Generated
+2803
View File
File diff suppressed because it is too large Load Diff