DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-12 14:27:33 -08:00
Code Issues Actions 1 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 2024-05-06 18:43:48 +01:00
parent db2baae758 4d00bb98d1
commit 4913e56086
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
config/version.php
View file

@ -1,10 +1,10 @@
<?php
return array (
'app_version' => 'v6.3.4',
'full_app_version' => 'v6.3.4 - build 13226-g5229dd65c',
'build_version' => '13226',
'app_version' => 'v6.4.0',
'full_app_version' => 'v6.4.0 - build 13351-gdb2baae758',
'build_version' => '13351',
'prerelease_version' => '',
'hash_version' => 'g5229dd65c',
'full_hash' => 'v6.3.4-85-g5229dd65c',
'hash_version' => 'gdb2baae758',
'full_hash' => 'v6.4.0-210-gdb2baae758',
'branch' => 'master',
);

2
upgrade.php
View file

@ -87,7 +87,7 @@ if($upgrade_requirements){
// done fetching requirements
if (!$no_interactive) {
$yesno = readline("\nProceed with upgrade? [Y/n]: ");
$yesno = readline("\nProceed with upgrade? [y/N]: ");
} else {
$yesno = "yes";
}