ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse Source 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
#	public/css/build/app.css
#	public/css/build/overrides.css
#	public/css/dist/all.css
#	public/css/dist/skins/skin-black-dark.css
#	public/css/dist/skins/skin-black-dark.min.css
#	public/css/dist/skins/skin-blue-dark.css
#	public/css/dist/skins/skin-blue-dark.min.css
#	public/css/dist/skins/skin-green-dark.css
#	public/css/dist/skins/skin-green-dark.min.css
#	public/css/dist/skins/skin-orange-dark.css
#	public/css/dist/skins/skin-orange-dark.min.css
#	public/css/dist/skins/skin-red-dark.css
#	public/css/dist/skins/skin-red-dark.min.css
#	public/css/dist/skins/skin-yellow-dark.css
#	public/css/dist/skins/skin-yellow-dark.min.css
#	public/mix-manifest.json
This commit is contained in:
snipe
2023-05-03 13:49:36 -07:00
parent 609b1646e9 cd6f6ee8ff
commit 5950ec27ab
66 changed files with 671 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/mail.php
+2 -2
View File
@@ -140,8 +140,8 @@ return [
|
*/
'sendmail' => '/usr/sbin/sendmail -bs',
'sendmail' => env('SENDMAIL_PATH', ini_get('sendmail_path')),
'markdown' => [
'theme' => 'default',
'paths' => [
config/version.php
+5 -5
View File
@@ -1,10 +1,10 @@
<?php
return array (
'app_version' => 'v6.1.0',
'full_app_version' => 'v6.1.0 - build 10161-ga8ca3ad2a',
'build_version' => '10161',
'app_version' => 'v6.1.1-pre',
'full_app_version' => 'v6.1.1-pre - build 10534-g609b1646e',
'build_version' => '10534',
'prerelease_version' => '',
'hash_version' => 'ga8ca3ad2a',
'full_hash' => 'v6.1.0-127-ga8ca3ad2a',
'hash_version' => 'g609b1646e',
'full_hash' => 'v6.1.1-pre-292-g609b1646e',
'branch' => 'master',
);