mirror of
https://github.com/snipe/snipe-it.git
synced 2024-11-09 23:24:06 -08:00
a5dbece1a9
Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # config/version.php # public/css/build/app.css # public/css/build/overrides.css # public/css/dist/all.css # public/mix-manifest.json
16 lines
420 B
PHP
16 lines
420 B
PHP
<?php
|
|
return array (
|
|
'app_version' => 'v7.0.12',
|
|
'full_app_version' => 'v7.0.12 - build 15249-g713bb104e',
|
|
'build_version' => '15249',
|
|
'prerelease_version' => '',
|
|
<<<<<<< HEAD
|
|
'hash_version' => 'g46ed07642',
|
|
'full_hash' => 'v7.0.11-133-g46ed07642',
|
|
'branch' => 'master',
|
|
=======
|
|
'hash_version' => 'g713bb104e',
|
|
'full_hash' => 'v7.0.12-338-g713bb104e',
|
|
'branch' => 'develop',
|
|
>>>>>>> origin/develop
|
|
); |