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-01-24 11:02:46 -08:00
parent 426bf3803b f5636f325d
commit edc30a31c1
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
return array (
'app_version' => 'v4.1.11-pre',
'full_app_version' => 'v4.1.11-pre - build 3280-g7a4bf26',
'build_version' => '3280',
'full_app_version' => 'v4.1.11-pre - build 3288-g426bf38',
'build_version' => '3288',
'prerelease_version' => '',
'hash_version' => 'g7a4bf26',
'full_hash' => 'v4.1.11-pre-28-g7a4bf26',
'hash_version' => 'g426bf38',
'full_hash' => 'v4.1.11-pre-36-g426bf38',
'branch' => 'master',
);