lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Merge branch 'develop'

Browse source 
# Conflicts:
#	config/version.php
This commit is contained in:
snipe 2018-01-11 15:27:17 -08:00
commit 1f04d7aafd
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
config/version.php
View file

@ -1,10 +1,10 @@
<?php <?php
return array ( return array (
'app_version' => 'v4.1.10-pre', 'app_version' => 'v4.1.10-pre',
'full_app_version' => 'v4.1.10-pre - build 3160-g3566f37', 'full_app_version' => 'v4.1.10-pre - build 3185-g5b15a2f',
'build_version' => '3160', 'build_version' => '3185',
'prerelease_version' => '', 'prerelease_version' => '',
'hash_version' => 'g3566f37', 'hash_version' => 'g5b15a2f',
'full_hash' => 'v4.1.10-pre-30-g3566f37', 'full_hash' => 'v4.1.10-pre-55-g5b15a2f',
'branch' => 'master', 'branch' => 'master',
); );