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-02-21 04:44:48 -08:00
parent 4ed2ef6298 ba4f63bca3
commit 42c8de5620
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
return array (
'app_version' => 'v4.1.11',
'full_app_version' => 'v4.1.11 - build 3359-',
'build_version' => '3359',
'app_version' => 'v4.1.12',
'full_app_version' => 'v4.1.12 - build 3365-g4ed2ef6',
'build_version' => '3365',
'prerelease_version' => '',
'hash_version' => '',
'full_hash' => 'v4.1.11',
'hash_version' => 'g4ed2ef6',
'full_hash' => 'v4.1.12-6-g4ed2ef6',
'branch' => 'master',
);