DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-13 06:47:46 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

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

# Conflicts:
#	config/version.php
This commit is contained in:
snipe 2022-07-18 16:50:53 -07:00
parent ff5d64fcbf 43bd00da86
commit e9121c15d8
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.env.example
View file

@ -76,6 +76,7 @@ ALLOW_DATA_PURGE=false
# -------------------------------------------- # --------------------------------------------
# OPTIONAL: SESSION SETTINGS # OPTIONAL: SESSION SETTINGS
# -------------------------------------------- # --------------------------------------------
SESSION_DRIVER=file
SESSION_LIFETIME=12000 SESSION_LIFETIME=12000
EXPIRE_ON_CLOSE=false EXPIRE_ON_CLOSE=false
ENCRYPT=false ENCRYPT=false
@ -98,7 +99,6 @@ ENABLE_HSTS=false
# OPTIONAL: CACHE SETTINGS # OPTIONAL: CACHE SETTINGS
# -------------------------------------------- # --------------------------------------------
CACHE_DRIVER=file CACHE_DRIVER=file
SESSION_DRIVER=file
QUEUE_DRIVER=sync QUEUE_DRIVER=sync
CACHE_PREFIX=snipeit CACHE_PREFIX=snipeit

10
config/version.php
View file

@ -1,10 +1,10 @@
<?php <?php
return array ( return array (
'app_version' => 'v6.0.7', 'app_version' => 'v6.0.8',
'full_app_version' => 'v6.0.7 - build 8351-gacc2e12f1', 'full_app_version' => 'v6.0.8 - build 8409-gff5d64fcb',
'build_version' => '8351', 'build_version' => '8409',
'prerelease_version' => '', 'prerelease_version' => '',
'hash_version' => 'gacc2e12f1', 'hash_version' => 'gff5d64fcb',
'full_hash' => 'v6.0.7-42-gacc2e12f1', 'full_hash' => 'v6.0.8-56-gff5d64fcb',
'branch' => 'master', 'branch' => 'master',
); );