Taylor Otwell 17f94e3081 fix conflicts

2023-08-31 12:06:32 -05:00

..

app.php

[10.x] Minor skeleton slimming (#6159)

2023-04-15 16:53:39 -05:00

auth.php

Fix typo (#6128)

2023-02-25 23:37:54 +05:30

broadcasting.php

Bring back cluster config option, as required by pusher-js v8.0. (#6174)

2023-05-12 13:39:56 -05:00

cache.php

add lock path

2023-05-23 16:45:40 -05:00

cors.php

add sanctum cookie endpoint to default cors paths

2020-11-10 14:18:52 -06:00

database.php

wip

2022-04-05 20:53:46 -05:00

filesystems.php

[9.x] add throw to filesystems config (#5835)

2022-03-06 10:30:51 -06:00

hashing.php

Update the default Argon2 options

2022-02-03 16:06:00 +01:00

logging.php

[10.x] Add replace_placeholders to log channels (#6139)

2023-03-08 10:57:09 -06:00

mail.php

fix conflicts

2023-08-31 12:06:32 -05:00

queue.php

Add job batching options to Queue configuration file (#6149)

2023-04-05 10:03:08 -05:00

sanctum.php

[9.x] Update sanctum config file (#5820)

2022-02-17 09:16:40 -06:00

services.php

Add option to configure Mailgun transporter scheme (#5831)

2022-03-03 08:13:57 -06:00

session.php

remove session key

2022-02-04 09:34:38 -06:00

view.php

remove config entry

2020-03-06 07:57:18 -06:00