Taylor Otwell 6f6851946b fix conflicts

2016-08-23 15:08:01 +02:00

..

app.php

fix conflicts

2016-08-23 15:08:01 +02:00

auth.php

[5.3] Password broker would always use notifications::email view.

2016-06-30 21:03:16 +08:00

broadcasting.php

Default broadcasting driver to null.

2016-08-05 15:51:22 -05:00

cache.php

fix conflicts

2016-07-09 11:28:21 -05:00

compile.php

Don't compile service providers by default.

2015-04-21 14:39:47 -05:00

database.php

Use proper PDO fetch style

2016-06-19 05:16:51 +02:00

filesystems.php

simplify filesystem default config

2016-02-11 10:19:57 -06:00

mail.php

Add default address in mail config.

2016-08-03 13:16:30 -05:00

queue.php

Tweak a few broadcasting configurations.

2016-08-05 15:44:29 -05:00

services.php

Remove mandrill as a default configuration since it's fallen out of popularity.

2016-07-21 11:49:28 -05:00

session.php

fix conflicts

2016-07-09 11:28:21 -05:00

view.php

Additional cs fixes

2015-06-01 15:46:45 +01:00