Merged development into master

This commit is contained in:
NelsonLaQuet 2013-09-02 05:06:02 -05:00
commit 73d38baa97
2 changed files with 7 additions and 2 deletions

View file

@ -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',
),
);

View file

@ -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": [