Merge branch 'release/3.3.8' into develop

This commit is contained in:
James Cole
2015-04-20 18:07:02 +02:00
3 changed files with 3 additions and 5 deletions

View File

@@ -1,5 +1,5 @@
APP_ENV=local APP_ENV=production
APP_DEBUG=true APP_DEBUG=false
APP_KEY=SomeRandomString APP_KEY=SomeRandomString
DB_CONNECTION=mysql DB_CONNECTION=mysql

View File

@@ -1,4 +1,4 @@
Firefly III (v3.3.7) Firefly III (v3.3.8)
=========== ===========
[![Build Status](https://travis-ci.org/JC5/firefly-iii.svg?branch=develop)](https://travis-ci.org/JC5/firefly-iii) [![Build Status](https://travis-ci.org/JC5/firefly-iii.svg?branch=develop)](https://travis-ci.org/JC5/firefly-iii)

View File

@@ -136,8 +136,6 @@ return [
'Illuminate\Validation\ValidationServiceProvider', 'Illuminate\Validation\ValidationServiceProvider',
'Illuminate\View\ViewServiceProvider', 'Illuminate\View\ViewServiceProvider',
'Illuminate\Html\HtmlServiceProvider', 'Illuminate\Html\HtmlServiceProvider',
'Barryvdh\Debugbar\ServiceProvider',
'Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider',
'DaveJamesMiller\Breadcrumbs\ServiceProvider', 'DaveJamesMiller\Breadcrumbs\ServiceProvider',
/* /*