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-07-19 10:50:18 -07:00
parent bbb15d610f 83692696ba
commit f692fb5bff
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
config/version.php
View file

@ -1,10 +1,10 @@
<?php <?php
return array ( return array (
'app_version' => 'v4.6.0', 'app_version' => 'v4.6.1',
'full_app_version' => 'v4.6.0 - build 3710-g961741b80', 'full_app_version' => 'v4.6.1 - build 3842-gbbb15d610',
'build_version' => '3710', 'build_version' => '3842',
'prerelease_version' => '', 'prerelease_version' => '',
'hash_version' => 'g961741b80', 'hash_version' => 'gbbb15d610',
'full_hash' => 'v4.6.0-3-g961741b80', 'full_hash' => 'v4.6.0-10-gbbb15d610',
'branch' => 'master', 'branch' => 'master',
); );