mirror of
https://github.com/snipe/snipe-it.git
synced 2024-11-09 23:24:06 -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
7464c3622e
|
@ -1,10 +1,10 @@
|
||||||
<?php
|
<?php
|
||||||
return array (
|
return array (
|
||||||
'app_version' => 'v7.0.8',
|
'app_version' => 'v7.0.9',
|
||||||
'full_app_version' => 'v7.0.8 - build 14243-g2e2f59b29',
|
'full_app_version' => 'v7.0.9 - build 14371-g1a541ce22',
|
||||||
'build_version' => '14243',
|
'build_version' => '14371',
|
||||||
'prerelease_version' => '',
|
'prerelease_version' => '',
|
||||||
'hash_version' => 'g2e2f59b29',
|
'hash_version' => 'g1a541ce22',
|
||||||
'full_hash' => 'v7.0.8-57-g2e2f59b29',
|
'full_hash' => 'v7.0.9-119-g1a541ce22',
|
||||||
'branch' => 'master',
|
'branch' => 'master',
|
||||||
);
|
);
|
Loading…
Reference in a new issue