DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -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 08:29:25 -08:00
parent 7a4bf26733 fcb5eea951
commit 07148c1503
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.10', 'app_version' => 'v4.1.11-pre',
'full_app_version' => 'v4.1.10 - build 3249-g8d3a214', 'full_app_version' => 'v4.1.11-pre - build 3280-g7a4bf26',
'build_version' => '3249', 'build_version' => '3280',
'prerelease_version' => '', 'prerelease_version' => '',
'hash_version' => 'g8d3a214', 'hash_version' => 'g7a4bf26',
'full_hash' => 'v4.1.10-119-g8d3a214', 'full_hash' => 'v4.1.11-pre-28-g7a4bf26',
'branch' => 'master', 'branch' => 'master',
); );