mirror of
https://github.com/Poniverse/Pony.fm.git
synced 2024-11-22 04:58:01 +01:00
Merged development into master
This commit is contained in:
commit
73d38baa97
2 changed files with 7 additions and 2 deletions
|
@ -115,6 +115,8 @@ return array(
|
|||
'Illuminate\Validation\ValidationServiceProvider',
|
||||
'Illuminate\View\ViewServiceProvider',
|
||||
'Illuminate\Workbench\WorkbenchServiceProvider',
|
||||
|
||||
'Intouch\LaravelNewrelic\LaravelNewrelicServiceProvider',
|
||||
|
||||
),
|
||||
|
||||
|
@ -180,7 +182,9 @@ return array(
|
|||
'URL' => 'Illuminate\Support\Facades\URL',
|
||||
'Validator' => 'Illuminate\Support\Facades\Validator',
|
||||
'View' => 'Illuminate\Support\Facades\View',
|
||||
|
||||
|
||||
'Newrelic' => 'Intouch\LaravelNewrelic\Facades\Newrelic',
|
||||
|
||||
),
|
||||
|
||||
);
|
||||
|
|
|
@ -3,7 +3,8 @@
|
|||
"laravel/framework": "4.0.*",
|
||||
"kriswallsmith/assetic": "1.2.*@dev",
|
||||
"codescale/ffmpeg-php": "2.7.0",
|
||||
"simplepie/simplepie": "1.3.1"
|
||||
"simplepie/simplepie": "1.3.1",
|
||||
"intouch/laravel-newrelic": "*"
|
||||
},
|
||||
"autoload": {
|
||||
"classmap": [
|
||||
|
|
Loading…
Reference in a new issue