ivo/ponzi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '11.x'

Browse Source 
# Conflicts:
#	CHANGELOG.md
This commit is contained in:
Dries Vints
2024-03-14 14:11:12 +01:00
parent 52c6ce38da 881f890b99
commit eee001a3df
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@@ -2,6 +2,6 @@
## [Unreleased](https://github.com/laravel/laravel/compare/v12.0.0...master) ## [Unreleased](https://github.com/laravel/laravel/compare/v12.0.0...master)
## [v12.0.0 (2025-??-??)](https://github.com/laravel/laravel/compare/v11.0.0...v12.0.0) ## [v12.0.0 (2025-??-??)](https://github.com/laravel/laravel/compare/v11.0.2...v12.0.0)
Laravel 12 includes a variety of changes to the application skeleton. Please consult the diff to see what's new. Laravel 12 includes a variety of changes to the application skeleton. Please consult the diff to see what's new.

2
config/database.php
View File

@@ -69,7 +69,7 @@ return [
'password' => env('DB_PASSWORD', ''), 'password' => env('DB_PASSWORD', ''),
'unix_socket' => env('DB_SOCKET', ''), 'unix_socket' => env('DB_SOCKET', ''),
'charset' => env('DB_CHARSET', 'utf8mb4'), 'charset' => env('DB_CHARSET', 'utf8mb4'),
'collation' => env('DB_COLLATION', 'utf8mb4_uca1400_ai_ci'), 'collation' => env('DB_COLLATION', 'utf8mb4_unicode_ci'),
'prefix' => '', 'prefix' => '',
'prefix_indexes' => true, 'prefix_indexes' => true,
'strict' => true, 'strict' => true,

2
resources/views/welcome.blade.php
View File

@@ -16,7 +16,7 @@
</style> </style>
</head> </head>
<body class="font-sans antialiased dark:bg-black dark:text-white/50"> <body class="font-sans antialiased dark:bg-black dark:text-white/50">
<div className="bg-gray-50 text-black/50 dark:bg-black dark:text-white/50"> <div class="bg-gray-50 text-black/50 dark:bg-black dark:text-white/50">
<img id="background" class="absolute -left-20 top-0 max-w-[877px]" src="https://laravel.com/assets/img/welcome/background.svg" /> <img id="background" class="absolute -left-20 top-0 max-w-[877px]" src="https://laravel.com/assets/img/welcome/background.svg" />
<div class="relative min-h-screen flex flex-col items-center justify-center selection:bg-[#FF2D20] selection:text-white"> <div class="relative min-h-screen flex flex-col items-center justify-center selection:bg-[#FF2D20] selection:text-white">
<div class="relative w-full max-w-2xl px-6 lg:max-w-7xl"> <div class="relative w-full max-w-2xl px-6 lg:max-w-7xl">