mirror of
https://github.com/grokability/snipe-it.git
synced 2026-03-12 17:52:00 +08:00
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # config/version.php
This commit is contained in:
@@ -1,10 +1,10 @@
|
||||
<?php
|
||||
return array (
|
||||
'app_version' => 'v6.0.2',
|
||||
'full_app_version' => 'v6.0.2 - build 7880-g43c5b412c',
|
||||
'build_version' => '7880',
|
||||
'full_app_version' => 'v6.0.2 - build 7961-g5bc5e9f10',
|
||||
'build_version' => '7961',
|
||||
'prerelease_version' => '',
|
||||
'hash_version' => 'g43c5b412c',
|
||||
'full_hash' => 'v6.0.2-128-g43c5b412c',
|
||||
'hash_version' => 'g5bc5e9f10',
|
||||
'full_hash' => 'v6.0.2-69-g5bc5e9f10',
|
||||
'branch' => 'master',
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user