DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-21 03:15:45 -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-02-21 01:27:11 -08:00
parent fedd2b638c 5fcbf9091e
commit 7865fbea7e
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.1.11-pre', 'app_version' => 'v4.1.11',
'full_app_version' => 'v4.1.11-pre - build 3344-g99205bf', 'full_app_version' => 'v4.1.11 - build 3357-gfedd2b6',
'build_version' => '3344', 'build_version' => '3357',
'prerelease_version' => '', 'prerelease_version' => '',
'hash_version' => 'g99205bf', 'hash_version' => 'gfedd2b6',
'full_hash' => 'v4.1.11-pre-92-g99205bf', 'full_hash' => 'v4.1.11-105-gfedd2b6',
'branch' => 'master', 'branch' => 'master',
); );