DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-02 08:21:09 -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 2022-06-05 17:16:21 -07:00
parent 5bc5e9f108 711c713ab8
commit 3dedd51b84
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
config/version.php
View file

@ -1,10 +1,10 @@
<?php
return array (
'app_version' => 'v6.0.2',
'full_app_version' => 'v6.0.2 - build 7880-g43c5b412c',
'build_version' => '7880',
'full_app_version' => 'v6.0.2 - build 7961-g5bc5e9f10',
'build_version' => '7961',
'prerelease_version' => '',
'hash_version' => 'g43c5b412c',
'full_hash' => 'v6.0.2-128-g43c5b412c',
'hash_version' => 'g5bc5e9f10',
'full_hash' => 'v6.0.2-69-g5bc5e9f10',
'branch' => 'master',
);