DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-26 14:09:43 -08:00
Code Issues Actions 11 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-11-03 14:18:55 -07:00
parent 30f4af3ac2 7c21158680
commit 23cbee9493
1 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 <?php
return array ( return array (
'app_version' => 'v6.0.12', 'app_version' => 'v6.0.13',
'full_app_version' => 'v6.0.12 - build 8876-gbc4c6abe0', 'full_app_version' => 'v6.0.13 - build 8923-g30f4af3ac',
'build_version' => '8876', 'build_version' => '8923',
'prerelease_version' => '', 'prerelease_version' => '',
'hash_version' => 'gbc4c6abe0', 'hash_version' => 'g30f4af3ac',
'full_hash' => 'v6.0.12-50-gbc4c6abe0', 'full_hash' => 'v6.0.13-97-g30f4af3ac',
'branch' => 'master', 'branch' => 'master',
); );