Taylor Otwell 4696e7bcb6 fix conflicts

2017-04-07 08:11:06 -05:00

..

app.php

Make app name configurable in environment file

2017-04-03 20:07:41 +01:00

auth.php

remove irrelevant comment

2016-09-01 09:01:57 -05:00

broadcasting.php

[5.4] Change PUSHER enviroment variable names

2017-01-18 20:56:57 +00:00

cache.php

tweak default cache directory

2016-12-31 21:25:17 -06:00

database.php

Adds socket to config/database.php for consistency

2017-03-15 17:23:34 -07:00

filesystems.php

make env variables for aws

2017-01-17 07:41:12 -06:00

mail.php

Apply fixes from StyleCI

2017-02-03 16:06:59 +00:00

queue.php

fix spacing

2017-01-21 10:15:05 -06: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 comment

2017-03-06 08:50:01 -06:00

view.php

Use consistent config paths

2017-03-05 13:30:16 +02:00