Merge remote-tracking branch 'origin/develop'

Signed-off-by: snipe <[email protected]> # Conflicts: # config/version.php
grokability · Jul 18, 2022 · e9121c1 · e9121c1
2 parents ff5d64f + 43bd00d
commit e9121c1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.env.example b/.env.example
@@ -76,6 +76,7 @@ ALLOW_DATA_PURGE=false
 # --------------------------------------------
 # OPTIONAL: SESSION SETTINGS
 # --------------------------------------------
+SESSION_DRIVER=file
 SESSION_LIFETIME=12000
 EXPIRE_ON_CLOSE=false
 ENCRYPT=false
@@ -98,7 +99,6 @@ ENABLE_HSTS=false
 # OPTIONAL: CACHE SETTINGS
 # --------------------------------------------
 CACHE_DRIVER=file
-SESSION_DRIVER=file
 QUEUE_DRIVER=sync
 CACHE_PREFIX=snipeit
 

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