mirror of
https://github.com/snipe/snipe-it.git
synced 2025-01-12 22:37: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
335f4e50a5
|
@ -1,10 +1,10 @@
|
|||
<?php
|
||||
return array (
|
||||
'app_version' => 'v5.1.6',
|
||||
'full_app_version' => 'v5.1.6 - build 6109-gace7abc1a',
|
||||
'build_version' => '6109',
|
||||
'app_version' => 'v5.1.7',
|
||||
'full_app_version' => 'v5.1.7 - build 6136-gbc0c88781',
|
||||
'build_version' => '6136',
|
||||
'prerelease_version' => '',
|
||||
'hash_version' => 'gace7abc1a',
|
||||
'full_hash' => 'v5.1.6-71-gace7abc1a',
|
||||
'hash_version' => 'gbc0c88781',
|
||||
'full_hash' => 'v5.1.7-25-gbc0c88781',
|
||||
'branch' => 'master',
|
||||
);
|
||||
);
|
Loading…
Reference in a new issue