Taylor Otwell a690bb7552 fix conflicts

2015-12-03 12:26:26 -06:00

..

app.php

Remove alias inspire

2015-11-25 10:51:14 -02:00

auth.php

update middleware and config

2015-12-03 12:25:38 -06:00

broadcasting.php

tweak options

2015-10-08 09:45:11 -05:00

cache.php

Additional cs fixes

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

compile.php

Don't compile service providers by default.

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

database.php

Redis connection setup in .env

2015-10-26 22:13:51 +06:00

filesystems.php

Additional cs fixes

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

mail.php

Removed config option for deleted feature

2015-10-30 18:15:40 +00:00

queue.php

added queue prefix to match the framework

2015-12-01 20:27:51 +00:00

services.php

Convert some variables to env variables in services.php.

2015-07-23 10:58:17 -05:00

session.php

Using the path parameter in the path method.

2015-05-28 15:31:26 -04:00

view.php

Additional cs fixes

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