DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-26 22:19:41 -08:00
Code Issues Actions 12 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 2023-06-21 19:07:07 +01:00
parent 2ac4449ea3 17a10a4342
commit c377e0617c
1 changed files with 5 additions and 5 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 <?php
return array ( return array (
'app_version' => 'v6.1.1-pre', 'app_version' => 'v6.1.1',
'full_app_version' => 'v6.1.1-pre - build 10778-gfc5b02e39', 'full_app_version' => 'v6.1.1 - build 10847-g2ac4449ea',
'build_version' => '10778', 'build_version' => '10847',
'prerelease_version' => '', 'prerelease_version' => '',
'hash_version' => 'gfc5b02e39', 'hash_version' => 'g2ac4449ea',
'full_hash' => 'v6.1.1-pre-536-gfc5b02e39', 'full_hash' => 'v6.1.1-605-g2ac4449ea',
'branch' => 'master', 'branch' => 'master',
); );