mirror of
https://github.com/snipe/snipe-it.git
synced 2025-01-12 06:17:28 -08:00
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # config/version.php
This commit is contained in:
commit
5d2cca855e
|
@ -1,10 +1,10 @@
|
|||
<?php
|
||||
return array (
|
||||
'app_version' => 'v7.0.3',
|
||||
'full_app_version' => 'v7.0.3 - build 13980-',
|
||||
'build_version' => '13980',
|
||||
'app_version' => 'v7.0.4',
|
||||
'full_app_version' => 'v7.0.4 - build 14011-g20d558785',
|
||||
'build_version' => '14011',
|
||||
'prerelease_version' => '',
|
||||
'hash_version' => '',
|
||||
'full_hash' => 'v7.0.3',
|
||||
'hash_version' => 'g20d558785',
|
||||
'full_hash' => 'v7.0.4-18-g20d558785',
|
||||
'branch' => 'master',
|
||||
);
|
Loading…
Reference in a new issue