3
0
mirror of https://github.com/snipe/snipe-it.git synced 2025-10-29 11:21:21 +00:00

Merge remote-tracking branch 'origin/develop'

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

# Conflicts:
#	config/version.php
This commit is contained in:
snipe 2025-07-07 21:54:04 +01:00
commit 016900bad8

View File

@ -1,10 +1,10 @@
<?php
return array (
'app_version' => 'v8.1.17',
'full_app_version' => 'v8.1.17 - build 18792-g33263f5a9',
'build_version' => '18792',
'app_version' => 'v8.1.18-pre',
'full_app_version' => 'v8.1.18-pre - build 18872-g2e8ae3376',
'build_version' => '18872',
'prerelease_version' => '',
'hash_version' => 'g33263f5a9',
'full_hash' => 'v8.1.17-180-g33263f5a9',
'hash_version' => 'g2e8ae3376',
'full_hash' => 'v8.1.18-pre-73-g2e8ae3376',
'branch' => 'master',
);