Taylor Otwell 0712d7b725 fix conflicts

2026-03-10 15:04:58 -05:00

..

app.php

[12.x] Fix type casting for environment variables in config files (#6637)

2025-07-03 08:32:07 -05:00

auth.php

Uses unqualified names (#6760)

2026-03-10 14:58:02 -05:00

cache.php

update wording

2026-02-18 16:52:17 -06:00

database.php

Uses unqualified names (#6760)

2026-03-10 14:58:02 -05:00

filesystems.php

[12.x] Add APP_URL fallback in filesystems config (#6742)

2026-01-19 09:16:42 -06:00

logging.php

[12.x] Fix type casting for environment variables in config files (#6637)

2025-07-03 08:32:07 -05:00

mail.php

[12.x] Add APP_NAME fallback in mail config (#6755)

2026-02-18 14:24:46 -06:00

queue.php

Add background driver (#6699)

2025-11-04 09:00:21 -06:00

services.php

update language

2025-10-30 12:37:53 -05:00

session.php

use json session serialization for new applications

2026-02-16 17:15:44 -06:00