DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-02 08:21:09 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse source 
# Conflicts:
#	config/version.php
This commit is contained in:
snipe 2018-03-22 20:48:02 -07:00
parent 130bb19a11 c4c137dc08
commit 846613c244
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
config/version.php
View file

@ -1,10 +1,10 @@
<?php
return array (
'app_version' => 'v4.1.15',
'full_app_version' => 'v4.1.15 - build 3479-gbf74bb1',
'app_version' => 'v4.2.0',
'full_app_version' => 'v4.2.0 - build 3479-gbf74bb1',
'build_version' => '3479',
'prerelease_version' => '',
'hash_version' => 'gbf74bb1',
'full_hash' => 'v4.1.15-3479-gbf74bb1',
'full_hash' => 'v4.2.0-3479-gbf74bb1',
'branch' => 'master',
);