PonyMirrors/Pony.fm
1
0
Fork 0
mirror of https://github.com/Poniverse/Pony.fm.git synced 2025-04-01 00:35:30 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merged development into master

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/config/app.php
View file

@ -116,6 +116,8 @@ return array(
'Illuminate\View\ViewServiceProvider', 'Illuminate\View\ViewServiceProvider',
'Illuminate\Workbench\WorkbenchServiceProvider', 'Illuminate\Workbench\WorkbenchServiceProvider',
'Intouch\LaravelNewrelic\LaravelNewrelicServiceProvider',
), ),
/* /*
@ -181,6 +183,8 @@ return array(
'Validator' => 'Illuminate\Support\Facades\Validator', 'Validator' => 'Illuminate\Support\Facades\Validator',
'View' => 'Illuminate\Support\Facades\View', 'View' => 'Illuminate\Support\Facades\View',
'Newrelic' => 'Intouch\LaravelNewrelic\Facades\Newrelic',
), ),
); );

3
composer.json
View file

@ -3,7 +3,8 @@
"laravel/framework": "4.0.*", "laravel/framework": "4.0.*",
"kriswallsmith/assetic": "1.2.*@dev", "kriswallsmith/assetic": "1.2.*@dev",
"codescale/ffmpeg-php": "2.7.0", "codescale/ffmpeg-php": "2.7.0",
"simplepie/simplepie": "1.3.1" "simplepie/simplepie": "1.3.1",
"intouch/laravel-newrelic": "*"
}, },
"autoload": { "autoload": {
"classmap": [ "classmap": [