Skip to content

S
syncEnrollments
Commit b218e80d authored by Taylor Otwell's avatar Taylor Otwell
Browse files
Options

Merge branch 'develop' of github.com:laravel/laravel into develop

parents f53ebbf6 9e690c8a
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
laravel/bundle.php
View file @ b218e80d
......@@ -159,7 +159,7 @@ class Bundle {
*/
public static function assets($bundle)
{
return ($bundle != DEFAULT_BUNDLE) ? PUBLIC_PATH."bundles/{$bundle}/" : PUBLIC_PATH;
return ($bundle != DEFAULT_BUNDLE) ? URL::base()."/bundles/{$bundle}/" : URL::base().'/';
}
/**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment