DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-09 23:24:06 -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-10-13 13:20:35 -07:00
parent 9151868839 0303df4b25
commit f4a3f896bd
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
return array (
'app_version' => 'v6.0.11',
'full_app_version' => 'v6.0.11 - build 8758-g61fa0bda4',
'build_version' => '8758',
'app_version' => 'v6.0.12',
'full_app_version' => 'v6.0.12 - build 8824-g915186883',
'build_version' => '8824',
'prerelease_version' => '',
'hash_version' => 'g61fa0bda4',
'full_hash' => 'v6.0.11-145-g61fa0bda4',
'hash_version' => 'g915186883',
'full_hash' => 'v6.0.12-64-g915186883',
'branch' => 'master',
);