Merge branch '1.1'

This commit is contained in:
Graham Campbell 2015-08-03 18:41:26 +01:00
commit 0c99204016

View File

@ -161,7 +161,6 @@ return [
'McCool\LaravelAutoPresenter\LaravelAutoPresenterServiceProvider',
'PragmaRX\Google2FA\Vendor\Laravel\ServiceProvider',
'Roumen\Feed\FeedServiceProvider',
'Barryvdh\Cors\CorsServiceProvider',
/*
* Application Service Providers...