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 2024-06-17 12:10:13 +01:00
parent b1f2051b43 60accfd601
commit 069a1608de
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
config/version.php
View file

@ -1,10 +1,10 @@
<?php <?php
return array ( return array (
'app_version' => 'v7.0.0', 'app_version' => 'v7.0.1',
'full_app_version' => 'v7.0.0 - build 13553-g9fccafa3a', 'full_app_version' => 'v7.0.1 - build 13553-g9fccafa3a',
'build_version' => '13553', 'build_version' => '13553',
'prerelease_version' => '', 'prerelease_version' => '',
'hash_version' => 'g9fccafa3a', 'hash_version' => 'g9fccafa3a',
'full_hash' => 'v7.0.0-51-g9fccafa3a', 'full_hash' => 'v7.0.1-51-g9fccafa3a',
'branch' => 'master', 'branch' => 'master',
); );