mirror of
https://github.com/snipe/snipe-it.git
synced 2025-01-13 06:47:46 -08:00
Merge remote-tracking branch 'origin/develop'
# Conflicts: # config/version.php
This commit is contained in:
commit
f182ce1c89
|
@ -1,10 +1,10 @@
|
|||
<?php
|
||||
return array (
|
||||
'app_version' => 'v5.0.1',
|
||||
'full_app_version' => 'v5.0.1 - build 5383-g870b097f0',
|
||||
'build_version' => '5383',
|
||||
'app_version' => 'v5.0.2',
|
||||
'full_app_version' => 'v5.0.2 - build 5414-gc3e8f6406',
|
||||
'build_version' => '5414',
|
||||
'prerelease_version' => '',
|
||||
'hash_version' => 'g870b097f0',
|
||||
'full_hash' => 'v5.0.0-1-g870b097f0',
|
||||
'hash_version' => 'gc3e8f6406',
|
||||
'full_hash' => 'v5.0.1-19-gc3e8f6406',
|
||||
'branch' => 'master',
|
||||
);
|
Loading…
Reference in a new issue