James Cole e094871bc9 Merge branch 'release/3.6.1' into develop ...

Conflicts:
	composer.lock

2016-01-09 14:31:52 +01:00

..

app.php

Debug class does not belong in production.

2016-01-08 16:29:14 +01:00

auth.php

Remove explanation text.

2016-01-09 07:32:23 +01:00

broadcasting.php

Updated config after upgrade to Laravel 5.2

2016-01-08 15:59:21 +01:00

cache.php

Updated config after upgrade to Laravel 5.2

2016-01-08 15:59:21 +01:00

compile.php

Updated config after upgrade to Laravel 5.2

2016-01-08 15:59:21 +01:00

csv.php

Added newlines to files.

2015-07-09 21:26:40 +02:00

database.php

Move database reference.

2016-01-09 08:47:54 +01:00

entrust.php

Code cleanup [skip ci]

2015-06-27 08:06:24 +02:00

filesystems.php

Updated config after upgrade to Laravel 5.2

2016-01-08 15:59:21 +01:00

firefly.php

New version.

2016-01-09 14:27:17 +01:00

mail.php

Updated config after upgrade to Laravel 5.2

2016-01-08 15:59:21 +01:00

queue.php

Updated config after upgrade to Laravel 5.2

2016-01-08 15:59:21 +01:00

services.php

Updated config after upgrade to Laravel 5.2

2016-01-08 15:59:21 +01:00

session.php

Updated config after upgrade to Laravel 5.2

2016-01-08 15:59:21 +01:00

twigbridge.php

String is a reserved class name in php7 changed to Str according to the upstream project

2016-01-03 15:52:12 +01:00

view.php

Updated config after upgrade to Laravel 5.2

2016-01-08 15:59:21 +01:00